On Thu, 13 Dec 2007, Alex Riesen 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.
It looks like I misunderstood the meaning of --no-commit. I have
to use --squash in this case.
Cheers,
Michael
-
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