When you have a fast-forwardable merge commit, you can amend this commit to hold additional changes. When you now do a rebase, git will believe this merge-commit is fast-forwardable, and will delete all amended changes. I believe when you amend a merge-commit it should become non-fastforwardable.
As rebase often needs to be applied (eg rebase -i; pull --rebase) this is a rather insidious way to loose files without warning. Here's a small testcase that creates a ff merge commit holding files f1, f2 and f3. When you execute the last rebase command, the f3 file will disappear from the filesystem. git init touch f1; git add f1; git commit -m "add f1" git checkout -b mybranch touch f2; git add f2; git commit -m "add f2" git checkout master git merge mybranch --no-ff -m "Merge mybranch" touch f3; git add f3 git commit --amend -m "Add f2 and f3" # Amend merge git rebase HEAD^ # f3 will sneakily be deleted, breaking the build and giving you CI duty :) kind regards Hans -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
