diff options
Diffstat (limited to 'third_party/git/Documentation/config/fmt-merge-msg.txt')
| -rw-r--r-- | third_party/git/Documentation/config/fmt-merge-msg.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/third_party/git/Documentation/config/fmt-merge-msg.txt b/third_party/git/Documentation/config/fmt-merge-msg.txt new file mode 100644 index 000000000000..c73cfa90b70c --- /dev/null +++ b/third_party/git/Documentation/config/fmt-merge-msg.txt @@ -0,0 +1,10 @@ +merge.branchdesc:: + In addition to branch names, populate the log message with + the branch description text associated with them. Defaults + to false. + +merge.log:: + In addition to branch names, populate the log message with at + most the specified number of one-line descriptions from the + actual commits that are being merged. Defaults to false, and + true is a synonym for 20. |