diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-23 11:20:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 11:20:15 -0800 |
| commit | 8c80ff362f1f4e586a37fba8e6dc83eee67aa2b5 (patch) | |
| tree | 6835fbb0e230e8439139bc17f4344d02af1f4346 /Documentation/git-fmt-merge-msg.txt | |
| parent | 78f4c9f62549fdd9a52550449c4e3148e7e0900d (diff) | |
| download | git-8c80ff362f1f4e586a37fba8e6dc83eee67aa2b5.tar.gz | |
Document merge.branchdesc configuration variable
This was part of the "branch description" feature in the larger
"help people communicate better during their pull based workflow"
topic, but was never documented.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
| -rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 32aff954a2..3a0f55ec8e 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -53,6 +53,11 @@ OPTIONS CONFIGURATION ------------- +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 |