diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:59 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:28:00 -0800 |
commit | 6afadbd5ee4557982a7c049bb5bb539a5b21775f (patch) | |
tree | 5ddafc3a2444440a239bfb900f309f4a34affb70 | |
parent | Merge branch 'rs/commit-pptr-simplify' into maint (diff) | |
parent | Documentation/fmt-merge-msg: fix markup in example (diff) | |
download | tgif-6afadbd5ee4557982a7c049bb5bb539a5b21775f.tar.xz |
Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint
Documentation fix.
* sc/fmt-merge-msg-doc-markup-fix:
Documentation/fmt-merge-msg: fix markup in example
-rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 6526b178e8..44892c447e 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -60,10 +60,10 @@ merge.summary:: EXAMPLE ------- --- +--------- $ git fetch origin master $ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD --- +--------- Print a log message describing a merge of the "master" branch from the "origin" remote. |