diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-05-09 05:46:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-05-09 05:46:08 +0000 |
| commit | 6d76d61fb621d158ee26238e735e282e33fb1a81 (patch) | |
| tree | edcabf096615344f6d597c38b9faf68b26ba024d /merge-options.txt | |
| parent | 47d68a53947d51de4f67b6b7e4e7f76e71e16fb5 (diff) | |
| download | git-htmldocs-6d76d61fb621d158ee26238e735e282e33fb1a81.tar.gz | |
Autogenerated HTML docs for v1.5.5.1-178-g1f81
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/merge-options.txt b/merge-options.txt index 9f1fc8255..f37a77648 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -1,10 +1,23 @@ ---summary:: +--stat:: Show a diffstat at the end of the merge. The diffstat is also - controlled by the configuration option merge.diffstat. + controlled by the configuration option merge.stat. --n, \--no-summary:: +-n, \--no-stat:: Do not show diffstat at the end of the merge. +--summary, \--no-summary:: + Synonyms to --stat and --no-stat; these are deprecated and will be + removed in the future. + +--log:: + In addition to branch names, populate the log message with + one-line descriptions from the actual commits that are being + merged. + +--no-log:: + Do not list one-line descriptions from the actual commits being + merged. + --no-commit:: Perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and |