Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rebase: Support preserving merges in non-interactive mode
[gitweb.git]
/
Documentation
/
git-rebase.txt
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index 32f0f122e937aab6b248d0ed86fa09854dbe253d..b86e80bb669081a9e86b14be61ad7604ec5d275b 100644
(file)
--- a/
Documentation/git-rebase.txt
+++ b/
Documentation/git-rebase.txt
@@
-250,8
+250,7
@@
OPTIONS
-p::
--preserve-merges::
- Instead of ignoring merges, try to recreate them. This option
- only works in interactive mode.
+ Instead of ignoring merges, try to recreate them.
include::merge-strategies.txt[]