Open GoogleCodeExporter opened 8 years ago
Please find a log that describe how to reproduce the problem. I'm using
git-repo to demonstrate the behavor of git merge.
repo should not use "git merge" to update a local branch if "git rebase" / "git
merge --ff-only" works. "git merge" should only be used if the latter failed.
Original comment by yann@droneaud.fr
on 13 Mar 2013 at 11:26
Attachments:
In my .gitconfig, I have the following lines:
[merge]
ff = false
because, by default, I want dev branches to stay visible when merged.
With this configuration, when I repo sync
, it does not fast forward, but creates a new merge commit.
Original issue reported on code.google.com by
yann@droneaud.fr
on 12 Mar 2013 at 4:59