> Pro tip: I've someone has pushed changes to Alioth while you made > your own changes in your clone, you use `git pull --rebase` to rebase
> your branch placing your changes on top of those from the Alioth
> repository.
I'd always preferred a merge since that reflects what actually happened, but I'm fine with rebasing in the future to save a commit.
Cheers,
Nico
On Thu, Mar 5, 2015 at 10:18 PM Sebastiaan Couwenberg <
sebastic@xs4all.nl> wrote:
On 03/05/2015 10:15 PM, Sebastiaan Couwenberg wrote:
> If you created the pristine-tar branch instead of cloning it from the
> git repository on Alioth, you need to use `git push origin pristine-tar
> --set-upstream` to have the branch track the origin repository. `git
> branch -av` will report the number of commits your branch is out of sync
> with the repository on Alioth.
Pro tip: I've someone has pushed changes to Alioth while you made your
own changes in your clone, you use `git pull --rebase` to rebase your
branch placing your changes on top of those from the Alioth repository.
Kind Regards,
Bas
--
GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
--
To UNSUBSCRIBE, email to debian-gis-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: [🔎] 54F8C7FD.5030605@xs4all.nl" target="_blank">https://lists.debian.org/[🔎] 54F8C7FD.5030605@xs4all.nl