diff options
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index fec339430..37ce9a17f 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -59,14 +59,15 @@ option can be used to override --squash. 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:: Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future. +ifndef::git-pull[] -q:: --quiet:: Operate quietly. @@ -74,3 +75,9 @@ option can be used to override --squash. -v:: --verbose:: Be verbose. +endif::git-pull[] + +-X <option>:: +--strategy-option=<option>:: + Pass merge strategy specific option through to the merge + strategy. |