diff options
Diffstat (limited to 'third_party/git/Documentation/merge-options.txt')
| -rw-r--r-- | third_party/git/Documentation/merge-options.txt | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/third_party/git/Documentation/merge-options.txt b/third_party/git/Documentation/merge-options.txt index 40dc4f5e8c..79a00d2a4a 100644 --- a/third_party/git/Documentation/merge-options.txt +++ b/third_party/git/Documentation/merge-options.txt @@ -34,30 +34,26 @@ set to `no` at the beginning of them. --cleanup=<mode>:: This option determines how the merge message will be cleaned up before - committing. See linkgit:git-commit[1] for more details. In addition, if + commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the 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:: - 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. + 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. -S[<keyid>]:: --gpg-sign[=<keyid>]:: @@ -109,10 +105,6 @@ option can be used to override --squash. + With --squash, --commit is not allowed, and will fail. ---no-verify:: - This option bypasses the pre-merge and commit-msg hooks. - See also linkgit:githooks[5]. - -s <strategy>:: --strategy=<strategy>:: Use the given merge strategy; can be supplied more than |