Re: Clean history

[Reinhold Kainhofer]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am Samstag, 16. August 2008 schrieb Han-Wen Nienhuys:
> please, if you find yourself creating graphs like the attached, invest
> some moments of your time in rebasing your changes.  It gets hard to
> see what is going on here.

I completely agree. 

When you have local commits, please don't do a (or even multiple like in this 
example) "git pull". Each pull will create a merge commit in this case...

What I usually do is to either 

1) First pull and then commit (only if I have not yet locally committed any 
changes!)

2) If I already have local commits, like in this case, I do a 
    "git fetch"
which will not update the current files, but download the latest history to 
the .git dir. Then I do a 
    "git rebase origin"
which takes the local commits and tries to append them to the latest master 
from the server. 
There might be some conflicts, though, if the same parts of the same files 
have been modified on the server, too. In this case you'll have to open the 
conflicting file, search for the <<<< indicating the problem spots and 
resolve it manually. Afterwards do a "git add conflicting-file-name" and "git 
rebase --continue". Now you'll locally have the latest master and on top of 
that all your local commits. No additional merge commits are created.

Cheers,
Reinhold


- -- 
- ------------------------------------------------------------------
Reinhold Kainhofer, Vienna University of Technology, Austria
email: address@hidden, http://reinhold.kainhofer.com/
 * Financial and Actuarial Mathematics, TU Wien, http://www.fam.tuwien.ac.at/
 * K Desktop Environment, http://www.kde.org, KOrganizer maintainer
 * Chorvereinigung "Jung-Wien", http://www.jung-wien.at/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFIqK3FTqjEwhXvPN0RAjb6AKC+4yfVCdWuMecGw4xPLipcYJnE1wCghxcy
nEdQTnTexPlmUxyMuGko3YQ=
=NYy1
-----END PGP SIGNATURE-----