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 /git-pull.html | |
| parent | 9149123b58ede4ca92a71abd3c09e3e2ad205b55 (diff) | |
| download | git-htmldocs-11f1537a82c84e620d742b3bc4256952defb28df.tar.gz | |
Autogenerated HTML docs for v2.21.0-135-g6e0cc
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/git-pull.html b/git-pull.html index e822e4402..9f42706bc 100644 --- a/git-pull.html +++ b/git-pull.html @@ -861,9 +861,13 @@ pulling or stash them away with <a href="git-stash.html">git-stash(1)</a>.</p></ Perform the merge and commit the result. This option can
be used to override --no-commit.
</p>
-<div class="paragraph"><p>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.</p></div>
+<div class="paragraph"><p>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.</p></div>
+<div class="paragraph"><p>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.</p></div>
</dd>
<dt class="hdlist1">
--edit
@@ -2085,7 +2089,7 @@ version.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-06-01 00:13:01 PDT
+ 2018-06-01 16:13:01 JST
</div>
</div>
</body>
|