diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-09-30 00:04:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-09-30 00:04:34 +0000 |
| commit | 3b4609d029e2db42b5154f019facecee49196bf0 (patch) | |
| tree | 6d059b8455a973760f1680791fbdf8c453fe387e /merge-options.txt | |
| parent | 442206cbc570d6bc05423bd8a54db5f06d740c65 (diff) | |
| download | git-htmldocs-3b4609d029e2db42b5154f019facecee49196bf0.tar.gz | |
Autogenerated HTML docs for v1.7.3.1-45-g9855
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-options.txt b/merge-options.txt index 722d704ff..e33e0f8e1 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -16,11 +16,11 @@ inspect and further tweak the merge result before committing. With --no-ff Generate a merge commit even if the merge resolved as a fast-forward. ---log:: +--log[=<n>]:: --no-log:: In addition to branch names, populate the log message with - one-line descriptions from the actual commits that are being - merged. + one-line descriptions from at most <n> actual commits that are being + merged. See also linkgit:git-fmt-merge-msg[1]. + With --no-log do not list one-line descriptions from the actual commits being merged. |