path: root/Documentation/merge-options.txt
diff options
Diffstat (limited to 'Documentation/merge-options.txt')
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index f37a776..ffbc6e9 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -2,10 +2,12 @@
Show a diffstat at the end of the merge. The diffstat is also
controlled by the configuration option merge.stat.
--n, \--no-stat::
Do not show diffstat at the end of the merge.
---summary, \--no-summary::
Synonyms to --stat and --no-stat; these are deprecated and will be
removed in the future.
@@ -49,7 +51,8 @@
a fast-forward, only update the branch pointer. This is
the default behavior of git-merge.
--s <strategy>, \--strategy=<strategy>::
+-s <strategy>::
Use the given merge strategy; can be supplied more than
once to specify them in the order they should be tried.
If there is no `-s` option, a built-in list of strategies