diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-05 22:01:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 22:01:30 (GMT) |
| commit | bb14cfdfd74c37f4319405eaebce0691c5b51db0 (patch) | |
| tree | ff830f599931dd6952e354ffd1ba0b2bedea8a76 /Documentation | |
| parent | a16548404789771fd3ee69f301893a08ef268bb2 (diff) | |
| parent | bd2bc94252a47443e19d366f8cc9626d4f92df7a (diff) | |
| download | git-bb14cfdfd74c37f4319405eaebce0691c5b51db0.zip git-bb14cfdfd74c37f4319405eaebce0691c5b51db0.tar.gz git-bb14cfdfd74c37f4319405eaebce0691c5b51db0.tar.bz2 | |
Merge branch 'jc/merge-detached-head-name'
The default merge message prepared by "git merge" records the name
of the current branch; the name can be overridden with a new option
to allow users to pretend a merge is made on a different branch.
* jc/merge-detached-head-name:
merge: allow to pretend a merge is made into a different branch
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-merge.txt | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 6793d8f..6f28812 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/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 diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index e8cecf5..3125473 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -12,7 +12,8 @@ SYNOPSIS 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] - [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...] + [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] + [--into-name <branch>] [<commit>...] 'git merge' (--continue | --abort | --quit) DESCRIPTION @@ -76,6 +77,11 @@ The 'git fmt-merge-msg' command can be used to give a good default for automated 'git merge' invocations. The automated message can include the branch description. +--into-name <branch>:: + Prepare the default 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>:: Read the commit message to be used for the merge commit (in |