-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Samstag, 28. März 2009 10:48:16 Graham Percival wrote:
> I'm confused. To update git (assuming I'm in the top-level
> directory), do I need:
> git fetch
> git rebase origin/master
> or
> git pull
> ?
Both work. There is one difference, though, if you have a local commit:
- -) git fetch + git rebase will take that local commit and append it after
the HEAD of current master, so it will be
yourcommit (=new local master)
|
current_remote_head
|
state when you last pulled/fetched
- -) git pull will merge your local commit and the current remote master:
(local master; merged)
| \
current_remote_head your_commit
| /
state when you last pulled/fetched
So, in the end the files will look similar in both cases (they will contain
both the local and the remote changes), but the history will be different...
Cheers,
Reinhold
- --
- ------------------------------------------------------------------
Reinhold Kainhofer, [email protected], http://reinhold.kainhofer.com/
* Financial & Actuarial Math., Vienna Univ. of Technology, Austria
* http://www.fam.tuwien.ac.at/, DVR: 0005886
* LilyPond, Music typesetting, http://www.lilypond.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iD8DBQFJzgKDTqjEwhXvPN0RAhf6AKDGPJdnmWO5jpo9EfjUaEr3CVt/ggCgkeR6
oVYI4cQIksEqDWmY836VGuA=
=GPdz
-----END PGP SIGNATURE-----
_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
