Matthias Lederhofer <matled@xxxxxxx> writes: > Signed-off-by: Matthias Lederhofer <matled@xxxxxxx> > --- > Documentation/core-tutorial.txt | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt > index 9c28bea..6f30e0a 100644 > --- a/Documentation/core-tutorial.txt > +++ b/Documentation/core-tutorial.txt > @@ -894,11 +894,11 @@ script called `git merge`, which wants to know which branches you want > to resolve and what the merge is all about: > > ------------ > -$ git merge "Merge work in mybranch" HEAD mybranch > +$ git merge -m "Merge work in mybranch" HEAD mybranch > ------------ Unfortunately it needs more than that. The funny command argument order in the original example was the command line format that has been in use internally for a long time: merge <msg> HEAD <other commit>. The human-accessible form that uses -m in front of <msg> does not need the second argument that always must match the current commit (it always must match so there is no point saying it). The original examples work perfectly Ok, and you broke it -- if you are doing '-m' you need to remove HEAD (and master in later ones) from the command line. - 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