diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-17 16:34:02 -0700 |
commit | 3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5 (patch) | |
tree | 49e1d04b52edbaa0b3d2fc549ad3cdbe30f9e1ee /git-fmt-merge-msg.txt | |
parent | ba7fe50148ec50de8394e1fe0f672c47bf6d4c17 (diff) | |
download | git-htmldocs-3d1b5a1ebc2e4d9c3323a8f2b1fac732562968b5.tar.gz |
Autogenerated HTML docs for v1.8.3-rc3
Diffstat (limited to 'git-fmt-merge-msg.txt')
-rw-r--r-- | git-fmt-merge-msg.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 3a0f55ec8..bb1232a52 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -35,8 +35,7 @@ OPTIONS Do not list one-line descriptions from the actual commits being merged. ---summary:: ---no-summary:: +--[no-]summary:: Synonyms to --log and --no-log; these are deprecated and will be removed in the future. |