diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-17 13:26:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-17 13:26:22 -0700 |
| commit | 7db630e9ad300e03ab260342c41c36ed83ecdd7a (patch) | |
| tree | 78e59560240f3901ff5f5fd41dd6578c654e4972 /git-merge.txt | |
| parent | 32af746de6ad79c9da1e27d09695a9bec7fa4df3 (diff) | |
| download | git-htmldocs-7db630e9ad300e03ab260342c41c36ed83ecdd7a.tar.gz | |
Autogenerated HTML docs for v2.6.0-rc2-23-g0e57
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 273a1009b..a62d6729b 100644 --- a/git-merge.txt +++ b/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 |