On 13/12/2007, Alex Riesen <raa.lkml@xxxxxxxxx> wrote: > On 13/12/2007, Michael Dressel <MichaelTiloDressel@xxxxxxxxxxx> wrote: > > git merge --no-commit <branch> does "create" a commit. At lesat the > > head and index are moved to the new commit fetched from <branch>. Maybe > > that is because git was able to do a fast forward? > > Yes. Because fast-forward is what it called: fast-forward. > It does not do any commits at all. > If you have a very recent git, you can avoid fast-forward when merging by running with --no-ff. It has it's problems in general case, so it is not default (see the git ml archive for "fast-forward does not commit"). - 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
