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 ------------ -where the first argument is going to be used as the commit message if -the merge can be resolved automatically. +The `-m` options specifies the commit message to be used for the merge commit +(in case it is created). Now, in this case we've intentionally created a situation where the merge will need to be fixed up by hand, though, so git will do as much @@ -981,7 +981,7 @@ resolve to get the "upstream changes" back to your branch. ------------ $ git checkout mybranch -$ git merge "Merge upstream changes." HEAD master +$ git merge -m "Merge upstream changes." HEAD master ------------ This outputs something like this (the actual commit object names @@ -1623,8 +1623,8 @@ in both of them. You could merge in 'diff-fix' first and then 'commit-fix' next, like this: ------------ -$ git merge 'Merge fix in diff-fix' master diff-fix -$ git merge 'Merge fix in commit-fix' master commit-fix +$ git merge -m 'Merge fix in diff-fix' master diff-fix +$ git merge -m 'Merge fix in commit-fix' master commit-fix ------------ Which would result in: -- 1.5.0.rc3.544.g79b8 - 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