summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-17 19:29:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-17 19:29:03 (GMT)
commita2654356d4ef9ffac4adda2b053d45def8e0a45c (patch)
tree6ff033bb7dea1c5afa9db2bddf153920fe6d01fd /Documentation/git-merge.txt
parent8d45eefe3ee6bf8499221761df1ee80ead2c8fc0 (diff)
parent561d2b7934caaa5e0917979da82ca59b17a4e5f9 (diff)
downloadgit-a2654356d4ef9ffac4adda2b053d45def8e0a45c.zip
git-a2654356d4ef9ffac4adda2b053d45def8e0a45c.tar.gz
git-a2654356d4ef9ffac4adda2b053d45def8e0a45c.tar.bz2
Merge branch 'po/doc-branch-desc'
The branch descriptions that are set with "git branch --edit-description" option were used in many places but they weren't clearly documented. * po/doc-branch-desc: doc: show usage of branch description
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 273a100..a62d672 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -78,7 +78,7 @@ will be appended to the specified message.
+
The 'git fmt-merge-msg' command can be
used to give a good default for automated 'git merge'
-invocations.
+invocations. The automated message can include the branch description.
--[no-]rerere-autoupdate::
Allow the rerere mechanism to update the index with the