Hello,
to avoid getting extra commit notification as "Merge branch 'master' of ...", do next command before pushing commits to remote repository:
git pull --ff --rebase origin master
The notification results when someone else committed in between the moment you pulled last time the repository and the push. A rebase will make all notification clean.
Cheers, Daniel
9 jan 2013 kl. 10:27 skrev Daniel-Constantin Mierla miconda@gmail.com:
Hello,
to avoid getting extra commit notification as "Merge branch 'master' of ...", do next command before pushing commits to remote repository:
git pull --ff --rebase origin master
The notification results when someone else committed in between the moment you pulled last time the repository and the push. A rebase will make all notification clean.
I made a small script called "gitpull" with these commands that I use instead of "git pull"...
Making it simple... /O
ahh, thanks Daniel!
On Wed, Jan 9, 2013 at 11:44 AM, Olle E. Johansson oej@edvina.net wrote:
9 jan 2013 kl. 10:27 skrev Daniel-Constantin Mierla miconda@gmail.com:
Hello,
to avoid getting extra commit notification as "Merge branch 'master' of
...", do next command before pushing commits to remote repository:
git pull --ff --rebase origin master
The notification results when someone else committed in between the
moment you pulled last time the repository and the push. A rebase will make all notification clean.
I made a small script called "gitpull" with these commands that I use instead of "git pull"...
Making it simple... /O _______________________________________________ sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
On Wednesday 09 January 2013, Daniel-Constantin Mierla wrote:
to avoid getting extra commit notification as "Merge branch 'master' of ...", do next command before pushing commits to remote repository:
git pull --ff --rebase origin master
Or just configure the master branch to automatically rebase instead of merge (overridable if necessary):
$ git config branch.master.rebase true
-
Alex Hermann -
Daniel-Constantin Mierla -
Jason Penton -
Olle E. Johansson