diff options
Diffstat (limited to 'Documentation/git-fmt-merge-msg.adoc')
| -rw-r--r-- | Documentation/git-fmt-merge-msg.adoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-fmt-merge-msg.adoc b/Documentation/git-fmt-merge-msg.adoc index 0f3328956d..6d91620be9 100644 --- a/Documentation/git-fmt-merge-msg.adoc +++ b/Documentation/git-fmt-merge-msg.adoc @@ -35,7 +35,8 @@ OPTIONS Do not list one-line descriptions from the actual commits being merged. ---[no-]summary:: +--summary:: +--no-summary:: Synonyms to --log and --no-log; these are deprecated and will be removed in the future. |