[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: odd configure error
From: |
Reinhold Kainhofer |
Subject: |
Re: odd configure error |
Date: |
Sat, 28 Mar 2009 11:57:06 +0100 |
User-agent: |
KMail/1.11.1 (Linux/2.6.27-11-generic; KDE/4.2.1; i686; ; ) |
-----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, address@hidden, 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-----
- Re: odd configure error, (continued)
- Re: odd configure error, Graham Percival, 2009/03/25
- Re: odd configure error, James E. Bailey, 2009/03/25
- Re: odd configure error, John Mandereau, 2009/03/25
- Re: odd configure error, James E. Bailey, 2009/03/25
- Re: odd configure error, Graham Percival, 2009/03/26
- Re: odd configure error, Patrick McCarty, 2009/03/26
- Re: odd configure error, Graham Percival, 2009/03/27
- Re: odd configure error, Reinhold Kainhofer, 2009/03/27
- Re: odd configure error, Patrick McCarty, 2009/03/27
- Re: odd configure error, Graham Percival, 2009/03/28
- Re: odd configure error,
Reinhold Kainhofer <=
- Re: odd configure error, Graham Percival, 2009/03/28
- Re: odd configure error, John Mandereau, 2009/03/31
- Re: odd configure error, Reinhold Kainhofer, 2009/03/31
- Re: odd configure error, Jan Nieuwenhuizen, 2009/03/27
- Re: odd configure error, Carl D. Sorensen, 2009/03/27
- Re: odd configure error, Graham Percival, 2009/03/27
- Re: odd configure error, Jan Nieuwenhuizen, 2009/03/27
- Re: odd configure error, Trevor Daniels, 2009/03/27
- Message not available
- Re: odd configure error, Graham Percival, 2009/03/28