diff options
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 722d704ff..e33e0f8e1 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/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. |