summaryrefslogtreecommitdiffstats
path: root/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-01-05 14:15:13 -0800
committerJunio C Hamano <gitster@pobox.com>2022-01-05 14:15:13 -0800
commite872a1cfb365aa9016e685705d691f75c4585220 (patch)
tree0cd8bbdef3f464a809208b7f0c3de532d991b2f5 /git-fmt-merge-msg.txt
parent05fe8d182bb7801152b0db4240ccc5643720f773 (diff)
downloadgit-htmldocs-e872a1cfb365aa9016e685705d691f75c4585220.tar.gz
Autogenerated HTML docs for v2.34.1-493-ge83ba
Diffstat (limited to 'git-fmt-merge-msg.txt')
-rw-r--r--git-fmt-merge-msg.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt
index 6793d8fc0..6f28812f3 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 fmt-merge-msg' [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]
'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>
DESCRIPTION
@@ -44,6 +44,10 @@ OPTIONS
Use <message> instead of the branch names for the first line
of the log message. For use with `--log`.
+--into-name <branch>::
+ Prepare the merge message as if merging to the branch `<branch>`,
+ instead of the name of the real branch to which the merge is made.
+
-F <file>::
--file <file>::
Take the list of merged objects from <file> instead of