diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-10-26 16:14:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-10-26 16:14:30 -0700 |
commit | daf0aaecf41c91c2307b7a38218f6b2d37669ad1 (patch) | |
tree | 2032469465a7995a1ae1f8fbbb2345e32a2aa50e /git-fmt-merge-msg.txt | |
parent | e265b5c6dbafc936b10575797cc098414af5b874 (diff) | |
download | git-htmldocs-daf0aaecf41c91c2307b7a38218f6b2d37669ad1.tar.gz |
Autogenerated HTML docs for v2.6.2-307-g37023b
Diffstat (limited to 'git-fmt-merge-msg.txt')
-rw-r--r-- | git-fmt-merge-msg.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 55a9a4b93..6526b178e 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -9,7 +9,7 @@ git-fmt-merge-msg - Produce a merge commit message SYNOPSIS -------- [verse] -'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] <$GIT_DIR/FETCH_HEAD +'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] 'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file> DESCRIPTION @@ -57,6 +57,18 @@ merge.summary:: Synonym to `merge.log`; this is deprecated and will be removed in the future. +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. + + SEE ALSO -------- linkgit:git-merge[1] |