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, 0 insertions, 10 deletions
diff --git a/third_party/git/Documentation/config/fmt-merge-msg.txt b/third_party/git/Documentation/config/fmt-merge-msg.txt deleted file mode 100644 index c73cfa90b7..0000000000 --- a/third_party/git/Documentation/config/fmt-merge-msg.txt +++ /dev/null @@ -1,10 +0,0 @@ -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. |