diff options
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 48d04a5d88..3b83dba1a0 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -49,13 +49,18 @@ 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). + is used instead ('git merge-recursive' when merging a single + head, 'git merge-octopus' otherwise). --summary:: --no-summary:: @@ -69,3 +74,8 @@ option can be used to override --squash. -v:: --verbose:: Be verbose. + +-X <option>:: +--strategy-option=<option>:: + Pass merge strategy specific option through to the merge + strategy. |