[prev in list] [next in list] [prev in thread] [next in thread] 

List:       uclibc
Subject:    Remember to rebase
From:       carmelo.amoroso () st ! com (Carmelo AMOROSO)
Date:       2009-05-06 12:54:59
Message-ID: 4A0188A3.5060606 () st ! com
[Download RAW message or body]

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

Austin Foxley wrote:
> Carmelo Amoroso wrote:
>> Indeed before actually pushing the changes, I've use git-push --dry-run.
>> Git notified that the repo was not in synch, so I've executed git-pull origin
>> (on both master and nptl branch), then git-push.
>> Where did I fail ?  please let me know.
> 
> I wouldn't really call it a failure, just extra noise.
> 
> git-pull by default does a fetch then a merge. In your case when you had a commit 
> that hadn't been pushed yet and there were upstream changes. You avoid the 
> extraneous merge commit by running git-pull --rebase to get the upstream changes. 
> The difference between a rebase and a merge is the key here. With a rebase, git 
> rewrites your local commit history with the one from upstream, and then 
> reapplies all your local work on top of it, which is what you want typically when 
> working with a central repo like we are.
> 
> The only caveat is your local repo's history is rewritten so you shouldn't publish *that*.
> 
> man git-pull talks a bit about this.
> 
> Make sense?
> 
Absolutely. Thanks Austin, it clarified me better the process.

> -Austin
Carmelo
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkoBiKMACgkQoRq/3BrK1s/APgCdFJ0UrqQBPBPvjDddqg+kCH6i
O8EAn3wnb51C+Q8CPh5VK/JQBX7oC12T
=E40G
-----END PGP SIGNATURE-----

[prev in list] [next in list] [prev in thread] [next in thread]