{"thread":{"id":"39443","subject":"[PATCH] Documentation: include 'merge.branchdesc' for merge and config as well","startedAt":"2015-05-27T21:52:23Z","lastAt":"2015-05-27T21:52:23Z","messageCount":1,"participants":["SZEDER Gábor"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"262285","messageId":"1432763543-3168-1-git-send-email-szeder@ira.uka.de","threadId":"39443","inReplyTo":null,"subject":"[PATCH] Documentation: include 'merge.branchdesc' for merge and config as well","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2015-05-27T21:52:23Z","receivedAt":"2015-05-27T21:52:23Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"'merge.branchdesc' is only mentioned in the docs of 'git fmt-merge-msg'.\n\nThe description of 'merge.log' is already duplicated between\n'merge-config.txt' and 'git-fmt-merge-msg.txt'; instead of duplicating the\ndescription of another config variable, extract the descriptions of both\nof these variables from 'git-fmt-merge-msg.txt' into a separate file and\ninclude it there and in 'merge-config.txt'.\n\nLeave 'merge.summary' only in git-fmt-merge-msg.txt, as it is marked for\ndeprecation.\n\nSigned-off-by: SZEDER Gábor <szeder@ira.uka.de>\n---\n Documentation/fmt-merge-msg-config.txt | 10 ++++++++++\n Documentation/git-fmt-merge-msg.txt    | 12 +-----------\n Documentation/merge-config.txt         |  6 +-----\n 3 files changed, 12 insertions(+), 16 deletions(-)\n create mode 100644 Documentation/fmt-merge-msg-config.txt\n\ndiff --git a/Documentation/fmt-merge-msg-config.txt b/Documentation/fmt-merge-msg-config.txt\nnew file mode 100644\nindex 0000000000..c73cfa90b7\n--- /dev/null\n+++ b/Documentation/fmt-merge-msg-config.txt\n@@ -0,0 +1,10 @@\n+merge.branchdesc::\n+\tIn addition to branch names, populate the log message with\n+\tthe branch description text associated with them.  Defaults\n+\tto false.\n+\n+merge.log::\n+\tIn addition to branch names, populate the log message with at\n+\tmost the specified number of one-line descriptions from the\n+\tactual commits that are being merged.  Defaults to false, and\n+\ttrue is a synonym for 20.\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex bb1232a52c..55a9a4b93a 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -51,17 +51,7 @@ OPTIONS\n \n CONFIGURATION\n -------------\n-\n-merge.branchdesc::\n-\tIn addition to branch names, populate the log message with\n-\tthe branch description text associated with them.  Defaults\n-\tto false.\n-\n-merge.log::\n-\tIn addition to branch names, populate the log message with at\n-\tmost the specified number of one-line descriptions from the\n-\tactual commits that are being merged.  Defaults to false, and\n-\ttrue is a synonym for 20.\n+include::fmt-merge-msg-config.txt[]\n \n merge.summary::\n \tSynonym to `merge.log`; this is deprecated and will be removed in\ndiff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt\nindex 8a0e52f8ee..002ca58c21 100644\n--- a/Documentation/merge-config.txt\n+++ b/Documentation/merge-config.txt\n@@ -26,11 +26,7 @@ merge.ff::\n \tallowed (equivalent to giving the `--ff-only` option from the\n \tcommand line).\n \n-merge.log::\n-\tIn addition to branch names, populate the log message with at\n-\tmost the specified number of one-line descriptions from the\n-\tactual commits that are being merged.  Defaults to false, and\n-\ttrue is a synonym for 20.\n+include::fmt-merge-msg-config.txt[]\n \n merge.renameLimit::\n \tThe number of files to consider when performing rename detection\n-- \n2.4.2.349.g6883b65\n"}]}