Am 11/10/2011 14:35, schrieb Pitucha, Stanislaw Izaak: > As mentioned in the original mail - the merge commit did have changes. > Here's the log of reproducing it. The line containing "2" in changelog > is gone from master after pull --rebase. > ... > disappearing_commit$ git merge --no-ff --no-commit some-branch > Automatic merge went well; stopped before committing as requested > disappearing_commit$ echo 2 >> changelog > disappearing_commit$ git add changelog > disappearing_commit$ git commit > [master e41e4c9] Merge branch 'some-branch' This is by design. Rebase does not rebase merge commits because it is assumed that merge commits only do what their name implies - to merge branches of a forked history. As such, they do not introduce their own changes. Follow this rule, i.e., make your change in a separate non-merge commit, and you are fine. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html