diff options
| author | Philip Oakley <philipoakley@iee.org> | 2015-09-14 15:10:53 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-14 12:50:33 -0700 |
| commit | 561d2b7934caaa5e0917979da82ca59b17a4e5f9 (patch) | |
| tree | 73f45ac56de72ced86792d271b82c6d218d32f54 /Documentation/git-merge.txt | |
| parent | ecad27cf98c391d5cfdc26ce0e442e02347baad0 (diff) | |
| download | git-561d2b7934caaa5e0917979da82ca59b17a4e5f9.tar.gz | |
doc: show usage of branch description
The branch description will be included in 'git format-patch
--cover-letter' and in 'git pull-request' emails. It can also
be used in the automatic merge message. Tell the reader.
While here, clarify that the description may be a multi-line
explanation of the purpose of the branch's patch series.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 cf2c374b71..7366c3a0b6 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 |