diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-07 07:33:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-07 07:33:38 (GMT) |
| commit | 7141b3b78099941f25b17388f56a917d4f7af51d (patch) | |
| tree | e7ff595f1fb6068b11a3a2c7eb71110faea998b8 /Documentation/merge-options.txt | |
| parent | 72e5890b68e7199d92620d3bba91fa36dd259404 (diff) | |
| parent | 44760f1d559ae2087e53be6971ad4f1a8f18f1d7 (diff) | |
| download | git-7141b3b78099941f25b17388f56a917d4f7af51d.zip git-7141b3b78099941f25b17388f56a917d4f7af51d.tar.gz git-7141b3b78099941f25b17388f56a917d4f7af51d.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt new file mode 100644 index 0000000..eebaf3a --- /dev/null +++ b/Documentation/merge-options.txt @@ -0,0 +1,16 @@ +-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, to give the user a chance to inspect and + further tweak the merge result before committing. + + +-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-resolve` when merging a single + head, `git-merge-octopus` otherwise). + |