diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-25 18:02:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 18:02:17 (GMT) |
| commit | ebf4fc90da239f1005d2c5b1a4278cfe51430151 (patch) | |
| tree | fbbf73c27da9cda04725eb7f5b21432db8622b93 /Documentation | |
| parent | 5fd72277d468ecf6b5685dbff14e8a4b2de8eb77 (diff) | |
| parent | fc0aa395f3205a049e917d391e2afa93cda0c8af (diff) | |
| download | git-ebf4fc90da239f1005d2c5b1a4278cfe51430151.zip git-ebf4fc90da239f1005d2c5b1a4278cfe51430151.tar.gz git-ebf4fc90da239f1005d2c5b1a4278cfe51430151.tar.bz2 | |
Merge branch 'sg/merge-summary-config' into maint
Doc updates.
* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/fmt-merge-msg-config.txt | 10 | ||||
| -rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 12 | ||||
| -rw-r--r-- | Documentation/merge-config.txt | 6 |
3 files changed, 12 insertions, 16 deletions
diff --git a/Documentation/fmt-merge-msg-config.txt b/Documentation/fmt-merge-msg-config.txt new file mode 100644 index 0000000..c73cfa9 --- /dev/null +++ b/Documentation/fmt-merge-msg-config.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. diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index bb1232a..55a9a4b 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -51,17 +51,7 @@ 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 - actual commits that are being merged. Defaults to false, and - true is a synonym for 20. +include::fmt-merge-msg-config.txt[] merge.summary:: Synonym to `merge.log`; this is deprecated and will be removed in diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 8a0e52f..002ca58 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -26,11 +26,7 @@ merge.ff:: allowed (equivalent to giving the `--ff-only` option from the command line). -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. +include::fmt-merge-msg-config.txt[] merge.renameLimit:: The number of files to consider when performing rename detection |