diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
| commit | eb415999b469f6d3e718f2fdf28dd460d8db5f4f (patch) | |
| tree | ca4b12fcea8cc51c42b66ee456255ee4ea85b203 /merge-options.txt | |
| parent | e2b205c118b67a65b1bde35ff88de1f7aceae8d0 (diff) | |
| download | git-htmldocs-eb415999b469f6d3e718f2fdf28dd460d8db5f4f.tar.gz | |
Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/merge-options.txt b/merge-options.txt index f37a77648..ffbc6e986 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -2,10 +2,12 @@ Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat. --n, \--no-stat:: +-n:: +--no-stat:: Do not show diffstat at the end of the merge. ---summary, \--no-summary:: +--summary:: +--no-summary:: Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future. @@ -49,7 +51,8 @@ a fast-forward, only update the branch pointer. This is the default behavior of git-merge. --s <strategy>, \--strategy=<strategy>:: +-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 |