diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-17 12:29:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-17 12:29:03 -0700 |
| commit | a2654356d4ef9ffac4adda2b053d45def8e0a45c (patch) | |
| tree | 6ff033bb7dea1c5afa9db2bddf153920fe6d01fd /Documentation/git-merge.txt | |
| parent | Merge branch 'et/win32-poll-timeout' (diff) | |
| parent | doc: show usage of branch description (diff) | |
| download | tgif-a2654356d4ef9ffac4adda2b053d45def8e0a45c.tar.xz | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 273a1009be..a62d6729b9 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 |