Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'tb/grep-only-matching'
[gitweb.git]
/
Documentation
/
git-rebase.txt
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index 9e136ee16e1a11716c8379c7f6434f103100c535..a7850415b1a831eb3d1530dbc71e194b27bd8d59 100644
(file)
--- a/
Documentation/git-rebase.txt
+++ b/
Documentation/git-rebase.txt
@@
-885,7
+885,7
@@
The ripple effect of a "hard case" recovery is especially bad:
case" recovery too!
REBASING MERGES
----------------
--
+---------------
The interactive rebase command was originally designed to handle
individual patch series. As such, it makes sense to exclude merge