Re: [SR-Dev] git:master: Merge branch 'master' of ssh://jh@git.sip-router.org/sip-router

On Apr 17, 2009 at 12:23, Juha Heinanen &lt;jh(a)tutpro.com&gt; wrote: No, it hasn't done anything bad to the code, it just added a useless merge message. What probably happened is that you have --no-ff in your ~/.gitconfig or .git/config for the master branch and you did: git pull ssh://jh@git.sip-router.org/sip-router master to update your local master version. However because of the --no-ff, this forced the generation of a merge message, which later got pushed to the repo when you pushed your changes. In general when you update your local branches, either always use git pull --ff origin <branchname> (e.g. git pull --ff origin master) or make sure you don't have --no-ff in gitconfig (but using --ff is safer since it does not depend on your config). You want to use --no-ff (force generation of a merge message) only when you merge 2 public branches. For example let's say I want to merge andrei/foo (which is published on the public repo) with master. In this case I would do: git checkout master git pull --ff origin master # make sure my local master is up-to-date git pull --no-ff origin andrei/foo # merge andrei/foo forcing a merge # message git push origin master:master # publish changes There is yet another possible case: you did some changes on your local master branch, but in the mean while the public master changed (someone else pushed some changes). In this case you could use pull to update your local copy before committing, but that would most likely add a merge message (because it won't be a fast-forward merge). Instead of a git pull, you could use git rebase: git fetch origin # get up-to-date version of branches in origin/ git checkout master # make sure you are on your local master branch git rebase origin/master # rebase your local changes on top of the # origin version git push origin master:master This would look much more clean from the history point of view. I would also recommend to use a different local branch name then master for bigger changes (e.g. one derived from what your are planning to do). For example, I do something like: git fetch origin git checkout -b tcp_fixes origin/master # no I am on my newly created local branch tcp_fixes, which tracks # origin/master vi ... # do some changes, & test them # prepare to commit them on master git fetch origin git rebase origin/master # rebase on the latest origin/master version git push origin HEAD:master On the public repo the history would look as if I would have worked directly on the latest master version. See also: http://sip-router.org/wiki/git/merge-into-master Andrei