diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 16:01:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 16:01:45 -0700 |
commit | f09b7cd0fc08d1df0fbd5c756672772049836b7a (patch) | |
tree | f5407aed048f255184084b9127f43dbf337eb27a /git-merge.txt | |
parent | 1ff0338e53a8f0c62e5a9370e770e20058c5ad1e (diff) | |
download | git-htmldocs-f09b7cd0fc08d1df0fbd5c756672772049836b7a.tar.gz |
Autogenerated HTML docs for v2.18.0-547-g1d893
Diffstat (limited to 'git-merge.txt')
-rw-r--r-- | git-merge.txt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/git-merge.txt b/git-merge.txt index 6a5c00e2c..eb36837f8 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] - [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] + [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...] 'git merge' --abort 'git merge' --continue @@ -75,6 +75,14 @@ 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. +-F <file>:: +--file=<file>:: + Read the commit message to be used for the merge commit (in + case one is created). ++ +If `--log` is specified, a shortlog of the commits being merged +will be appended to the specified message. + --[no-]rerere-autoupdate:: Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible. @@ -122,9 +130,9 @@ merge' may need to update. To avoid recording unrelated changes in the merge commit, 'git pull' and 'git merge' will also abort if there are any changes -registered in the index relative to the `HEAD` commit. (One -exception is when the changed index entries are in the state that -would result from the merge already.) +registered in the index relative to the `HEAD` commit. (Special +narrow exceptions to this rule may exist depending on which merge +strategy is in use, but generally, the index must match HEAD.) If all named commits are already ancestors of `HEAD`, 'git merge' will exit early with the message "Already up to date." |