From: Jari Aalto <jari.aalto@xxxxxxxxx>
Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx>
---
Documentation/merge-options.txt | 51 +++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index e33e0f8..15b6236 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -16,6 +16,11 @@ inspect and further tweak the merge result before committing.
With --no-ff Generate a merge commit even if the merge
resolved as a fast-forward.
+--ff-only::
+ Refuse to merge and exit with a non-zero status unless the
+ current `HEAD` is already up-to-date or the merge can be
+ resolved as a fast-forward.
+
--log[=<n>]::
--no-log::
In addition to branch names, populate the log message with
@@ -25,15 +30,13 @@ resolved as a fast-forward.
With --no-log do not list one-line descriptions from the
actual commits being merged.
-
---stat::
--n::
---no-stat::
- Show a diffstat at the end of the merge. The diffstat is also
- controlled by the configuration option merge.stat.
-+
-With -n or --no-stat do not show a diffstat at the end of the
-merge.
+-s <strategy>::
+--strategy=<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
+ is used instead ('git merge-recursive' when merging a single
+ head, 'git merge-octopus' otherwise).
--squash::
--no-squash::
@@ -49,23 +52,14 @@ merge.
With --no-squash perform the merge and commit the result. This
option can be used to override --squash.
---ff-only::
- Refuse to merge and exit with a non-zero status unless the
- current `HEAD` is already up-to-date or the merge can be
- resolved as a fast-forward.
-
--s <strategy>::
---strategy=<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
- is used instead ('git merge-recursive' when merging a single
- head, 'git merge-octopus' otherwise).
-
--X <option>::
---strategy-option=<option>::
- Pass merge strategy specific option through to the merge
- strategy.
+--stat::
+-n::
+--no-stat::
+ Show a diffstat at the end of the merge. The diffstat is also
+ controlled by the configuration option merge.stat.
++
+With -n or --no-stat do not show a diffstat at the end of the
+merge.
--summary::
--no-summary::
@@ -77,6 +71,11 @@ ifndef::git-pull[]
--quiet::
Operate quietly.
+-X <option>::
+--strategy-option=<option>::
+ Pass merge strategy specific option through to the merge
+ strategy.
+
-v::
--verbose::
Be verbose.
--
1.7.2.3
--
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