diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 12:17:00 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 12:17:00 +0900 |
| commit | 11f1537a82c84e620d742b3bc4256952defb28df (patch) | |
| tree | 2923ff40fbf10f29b7eaa506c2deb52e00e08dde /merge-options.txt | |
| parent | 9149123b58ede4ca92a71abd3c09e3e2ad205b55 (diff) | |
| download | git-htmldocs-11f1537a82c84e620d742b3bc4256952defb28df.tar.gz | |
Autogenerated HTML docs for v2.21.0-135-g6e0cc
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/merge-options.txt b/merge-options.txt index 63a3fc095..92a7d936c 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -3,9 +3,14 @@ Perform the merge and commit the result. This option can be used to override --no-commit. + -With --no-commit perform the merge but pretend the merge -failed and do not autocommit, to give the user a chance to -inspect and further tweak the merge result before committing. +With --no-commit perform the merge and stop just before creating +a merge commit, to give the user a chance to inspect and further +tweak the merge result before committing. ++ +Note that fast-forward updates do not create a merge commit and +therefore there is no way to stop those merges with --no-commit. +Thus, if you want to ensure your branch is not changed or updated +by the merge command, use --no-ff with --no-commit. --edit:: -e:: |