diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-05 10:36:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-05 10:36:49 -0700 |
| commit | 31731b0ea4fccf5455ce367d483feaabdc411e0a (patch) | |
| tree | 02b100f4b59557e9b2eb0f1392de697e812c3aa1 | |
| parent | t0003: properly quote $HOME (diff) | |
| parent | Fix a formatting error in git-merge.txt (diff) | |
| download | tgif-31731b0ea4fccf5455ce367d483feaabdc411e0a.tar.xz | |
Merge branch 'maint'
* maint:
Fix a formatting error in git-merge.txt
| -rw-r--r-- | Documentation/git-merge.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 84043cc5b2..d43416d299 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -59,13 +59,13 @@ include::merge-options.txt[] -m <msg>:: Set the commit message to be used for the merge commit (in case one is created). - - If `--log` is specified, a shortlog of the commits being merged - 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. ++ +If `--log` is specified, a shortlog of the commits being merged +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. --rerere-autoupdate:: --no-rerere-autoupdate:: |