diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
| commit | eb415999b469f6d3e718f2fdf28dd460d8db5f4f (patch) | |
| tree | ca4b12fcea8cc51c42b66ee456255ee4ea85b203 /git-fmt-merge-msg.txt | |
| parent | e2b205c118b67a65b1bde35ff88de1f7aceae8d0 (diff) | |
| download | git-htmldocs-eb415999b469f6d3e718f2fdf28dd460d8db5f4f.tar.gz | |
Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
Diffstat (limited to 'git-fmt-merge-msg.txt')
| -rw-r--r-- | git-fmt-merge-msg.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 328cc542d..2a7cfb980 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -33,11 +33,13 @@ OPTIONS Do not list one-line descriptions from the actual commits being merged. ---summary,--no-summary:: +--summary:: +--no-summary:: Synonyms to --log and --no-log; these are deprecated and will be removed in the future. ---file <file>, -F <file>:: +-F <file>:: +--file <file>:: Take the list of merged objects from <file> instead of stdin. |