diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:58 (GMT) |
| commit | 082c15ade1833e80a65c36d2499676a924d6d6aa (patch) | |
| tree | 2b648a2506aab4873a188668968ef005fc9589d3 /Documentation | |
| parent | b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8 (diff) | |
| parent | 1ede45e44b3b3bef8598ca077a60a6483ede99ae (diff) | |
| download | git-082c15ade1833e80a65c36d2499676a924d6d6aa.zip git-082c15ade1833e80a65c36d2499676a924d6d6aa.tar.gz git-082c15ade1833e80a65c36d2499676a924d6d6aa.tar.bz2 | |
Merge branch 'en/merge-options-doc'
Doc update.
* en/merge-options-doc:
merge-options.txt: correct wording of --no-commit option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-options.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 63a3fc0..92a7d93 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/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:: |