Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t3432: test for --no-ff's interaction with fast-forward
[gitweb.git]
/
Documentation
/
merge-options.txt
diff --git
a/Documentation/merge-options.txt
b/Documentation/merge-options.txt
index 61876dbc335e240b8842aba3dd4e3fd8a54e574a..79a00d2a4abd6f7191f2639185e199fa85f6289b 100644
(file)
--- a/
Documentation/merge-options.txt
+++ b/
Documentation/merge-options.txt
@@
-102,6
+102,8
@@
merge.
+
With --no-squash perform the merge and commit the result. This
option can be used to override --squash.
++
+With --squash, --commit is not allowed, and will fail.
-s <strategy>::
--strategy=<strategy>::