diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-05-09 05:46:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-05-09 05:46:08 +0000 |
| commit | 6d76d61fb621d158ee26238e735e282e33fb1a81 (patch) | |
| tree | edcabf096615344f6d597c38b9faf68b26ba024d /git-fmt-merge-msg.txt | |
| parent | 47d68a53947d51de4f67b6b7e4e7f76e71e16fb5 (diff) | |
| download | git-htmldocs-6d76d61fb621d158ee26238e735e282e33fb1a81.tar.gz | |
Autogenerated HTML docs for v1.5.5.1-178-g1f81
Diffstat (limited to 'git-fmt-merge-msg.txt')
| -rw-r--r-- | git-fmt-merge-msg.txt | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 8615ae353..457cf4256 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -9,8 +9,8 @@ git-fmt-merge-msg - Produce a merge commit message SYNOPSIS -------- [verse] -git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD -git-fmt-merge-msg [--summary | --no-summary] -F <file> +git-fmt-merge-msg [--log | --no-log] <$GIT_DIR/FETCH_HEAD +git-fmt-merge-msg [--log | --no-log] -F <file> DESCRIPTION ----------- @@ -24,15 +24,19 @@ automatically invoking `git-merge`. OPTIONS ------- ---summary:: +--log:: In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged. ---no-summary:: +--no-log:: Do not list one-line descriptions from the actual commits being merged. +--summary,--no-summary:: + Synonyms to --log and --no-log; these are deprecated and will be + removed in the future. + --file <file>, -F <file>:: Take the list of merged objects from <file> instead of stdin. @@ -40,10 +44,14 @@ OPTIONS CONFIGURATION ------------- -merge.summary:: +merge.log:: Whether to include summaries of merged commits in newly merge commit messages. False by default. +merge.summary:: + Synonym to `merge.log`; this is deprecated and will be removed in + the future. + SEE ALSO -------- linkgit:git-merge[1] |