projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http-fetch: do not use curl_message after releasing it
[git.git]
/
Documentation
/
merge-pull-opts.txt
diff --git
a/Documentation/merge-pull-opts.txt
b/Documentation/merge-pull-opts.txt
index
d03fd16
..
d9164a0
100644
(file)
--- a/
Documentation/merge-pull-opts.txt
+++ b/
Documentation/merge-pull-opts.txt
@@
-3,7
+3,8
@@
--no-commit::
Perform the merge but pretend the merge failed and do
--no-commit::
Perform the merge but pretend the merge failed and do
- not autocommit.
+ not autocommit, to give the user a chance to inspect and
+ further tweak the merge result before committing.
-s <strategy>::
use that merge strategy; can be given more than once to
-s <strategy>::
use that merge strategy; can be given more than once to