diff options
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 3b83dba..722d704 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -62,11 +62,17 @@ option can be used to override --squash. 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. + --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,8 +80,4 @@ 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. +endif::git-pull[] |