Merge branch 'nd/commit-editor-cleanup'
"git commit --cleanup=<mode>" learned a new mode, scissors. * nd/commit-editor-cleanup: commit: add --cleanup=scissors wt-status.c: move cut-line print code out to wt_status_add_cut_line wt-status.c: make cut_line[] const to shrink .data section a bit
This commit is contained in:
@ -176,7 +176,7 @@ OPTIONS
|
||||
--cleanup=<mode>::
|
||||
This option determines how the supplied commit message should be
|
||||
cleaned up before committing. The '<mode>' can be `strip`,
|
||||
`whitespace`, `verbatim`, or `default`.
|
||||
`whitespace`, `verbatim`, `scissors` or `default`.
|
||||
+
|
||||
--
|
||||
strip::
|
||||
@ -186,6 +186,12 @@ whitespace::
|
||||
Same as `strip` except #commentary is not removed.
|
||||
verbatim::
|
||||
Do not change the message at all.
|
||||
scissors::
|
||||
Same as `whitespace`, except that everything from (and
|
||||
including) the line
|
||||
"`# ------------------------ >8 ------------------------`"
|
||||
is truncated if the message is to be edited. "`#`" can be
|
||||
customized with core.commentChar.
|
||||
default::
|
||||
Same as `strip` if the message is to be edited.
|
||||
Otherwise `whitespace`.
|
||||
|
Reference in New Issue
Block a user