projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce i18n.commitencoding.
[git.git]
/
Documentation
/
git-merge.txt
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index
3e058db
..
904e2fc
100644
(file)
--- a/
Documentation/git-merge.txt
+++ b/
Documentation/git-merge.txt
@@
-19,7
+19,7
@@
which drives multiple merge strategy scripts.
OPTIONS
-------
OPTIONS
-------
-include::merge-
pull-opt
s.txt[]
+include::merge-
option
s.txt[]
<msg>::
The commit message to be used for the merge commit (in case
<msg>::
The commit message to be used for the merge commit (in case
@@
-34,6
+34,8
@@
include::merge-pull-opts.txt[]
least one <remote>. Specifying more than one <remote>
obviously means you are trying an Octopus.
least one <remote>. Specifying more than one <remote>
obviously means you are trying an Octopus.
+include::merge-strategies.txt[]
+
SEE ALSO
--------
SEE ALSO
--------