diff options
| author | Andrew Ruder <andy@aeruder.net> | 2007-04-26 23:58:57 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-26 22:43:10 -0700 |
| commit | 2bc060cc6fce9f51240bf35803a5690dd1813c7c (patch) | |
| tree | eef0f0ef71f0da006b9d9286590e6e8b02819589 /help.c | |
| parent | 42905294de0c1885f5636319c4790f184d767875 (diff) | |
| download | git-2bc060cc6fce9f51240bf35803a5690dd1813c7c.tar.gz git-2bc060cc6fce9f51240bf35803a5690dd1813c7c.tar.xz | |
Update git-fmt-merge documentation
Documentation/git-fmt-merge-msg.txt:
--summary to list commit summaries on merge
--no-summary
--file to take merged objects from a file.
Configuration option merge.summary
Signed-off-by: Andrew Ruder <andy@aeruder.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'help.c')
0 files changed, 0 insertions, 0 deletions