path: root/Documentation/git-merge.txt
diff options
authorJunio C Hamano <>2007-10-31 04:44:43 (GMT)
committerJunio C Hamano <>2007-10-31 04:44:43 (GMT)
commit9c51414f8efb73525a6c69917f1499dab081679d (patch)
treec10e59ae2c3257c5e5a8d108a2e4f5b6f6fe7995 /Documentation/git-merge.txt
parent7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a (diff)
parent0bdb5af7a571ee2bd71550a545632b1cb7f8f8f3 (diff)
Merge branch 'maint' into HEAD
* maint: Update GIT Release Notes Make 3-way merge strategies work for -p. Don't pass a strategy to git-cherry-pick. Fix --strategy parsing in Make merge-recursive honor diff.renamelimit cherry-pick/revert: more compact user direction message core-tutorial: Use new syntax for git-merge. git-merge: document but discourage the historical syntax Prevent send-pack from segfaulting (backport from 'master') Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example Conflicts:
Diffstat (limited to 'Documentation/git-merge.txt')
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index bca4212..eabd7ef 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -11,26 +11,27 @@ SYNOPSIS
'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]...
[-m <msg>] <remote> <remote>...
+'git-merge' <msg> HEAD <remote>...
This is the top-level interface to the merge machinery
which drives multiple merge strategy scripts.
+The second syntax (<msg> `HEAD` <remote>) is supported for
+historical reasons. Do not use it from the command line or in
+new scripts. It is the same as `git merge -m <msg> <remote>`.
+-m <msg>::
The commit message to be used for the merge commit (in case
it is created). The `git-fmt-merge-msg` script can be used
to give a good default for automated `git-merge` invocations.
- Our branch head commit. This has to be `HEAD`, so new
- syntax does not require it
Other branch head merged into our branch. You need at
least one <remote>. Specifying more than one <remote>