Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/enhanced-version-info'
[gitweb.git]
/
Documentation
/
git-rebase.txt
diff --git
a/Documentation/git-rebase.txt
b/Documentation/git-rebase.txt
index 0e20a66e73cf420c83b156d1a0aaa8f60cd4702f..091eb53faa708da2015809b477ef3914a8ee249d 100644
(file)
--- a/
Documentation/git-rebase.txt
+++ b/
Documentation/git-rebase.txt
@@
-804,7
+804,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