diff options
Diffstat (limited to 'Documentation/merge-pull-opts.txt')
| -rw-r--r-- | Documentation/merge-pull-opts.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/merge-pull-opts.txt b/Documentation/merge-pull-opts.txt new file mode 100644 index 0000000000..d03fd16178 --- /dev/null +++ b/Documentation/merge-pull-opts.txt @@ -0,0 +1,13 @@ +-n, --no-summary:: + Do not show diffstat at the end of the merge. + +--no-commit:: + Perform the merge but pretend the merge failed and do + not autocommit. + +-s <strategy>:: + use that merge strategy; can be given more than once to + specify them in the order they should be tried. If + there is no `-s` option, built-in list of strategies is + used instead (`git-merge-resolve` when merging a single + head, `git-merge-octopus` otherwise). |