diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:15:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:15:13 -0800 |
| commit | e872a1cfb365aa9016e685705d691f75c4585220 (patch) | |
| tree | 0cd8bbdef3f464a809208b7f0c3de532d991b2f5 /git-merge.txt | |
| parent | 05fe8d182bb7801152b0db4240ccc5643720f773 (diff) | |
| download | git-htmldocs-e872a1cfb365aa9016e685705d691f75c4585220.tar.gz | |
Autogenerated HTML docs for v2.34.1-493-ge83ba
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index e8cecf5a5..3125473cc 100644 --- a/git-merge.txt +++ b/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 |