diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 14:07:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 14:07:45 +0900 |
| commit | a8858316fb3186e69d324183d9af58ef55dfb794 (patch) | |
| tree | 4f60790af5953a6a07e822d2b92123ac3263ed3c /merge-options.txt | |
| parent | cb705397f111dc1fcb3e3fa844bfd5b3050dee38 (diff) | |
| download | git-htmldocs-a8858316fb3186e69d324183d9af58ef55dfb794.tar.gz | |
Autogenerated HTML docs for v2.23.0-385-gbc129
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/merge-options.txt b/merge-options.txt index d6a9f4b96..59b8ff1e5 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -40,20 +40,24 @@ set to `no` at the beginning of them. case of a merge conflict. --ff:: - When the merge resolves as a fast-forward, only update the branch - pointer, without creating a merge commit. This is the default - behavior. - --no-ff:: - Create a merge commit even when the merge resolves as a - fast-forward. This is the default behaviour when merging an - annotated (and possibly signed) tag that is not stored in - its natural place in 'refs/tags/' hierarchy. - --ff-only:: - Refuse to merge and exit with a non-zero status unless the - current `HEAD` is already up to date or the merge can be - resolved as a fast-forward. + Specifies how a merge is handled when the merged-in history is + already a descendant of the current history. `--ff` is the + default unless merging an annotated (and possibly signed) tag + that is not stored in its natural place in the `refs/tags/` + hierarchy, in which case `--no-ff` is assumed. ++ +With `--ff`, when possible resolve the merge as a fast-forward (only +update the branch pointer to match the merged branch; do not create a +merge commit). When not possible (when the merged-in history is not a +descendant of the current history), create a merge commit. ++ +With `--no-ff`, create a merge commit in all cases, even when the merge +could instead be resolved as a fast-forward. ++ +With `--ff-only`, resolve the merge as a fast-forward when possible. +When not possible, refuse to merge and exit with a non-zero status. -S[<keyid>]:: --gpg-sign[=<keyid>]:: |