summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-07-18 13:16:48 -0700
committerJunio C Hamano <gitster@pobox.com>2018-07-18 13:16:48 -0700
commitea1ac8d6d6d8856d448e1f6e2d941f7663dc9ecd (patch)
tree50a7bda536235313b6288988e779c75bc53970e5 /git-rebase.txt
parentec40f134aa677499a0c1bf7ea6133b7b5fe348c4 (diff)
downloadgit-htmldocs-ea1ac8d6d6d8856d448e1f6e2d941f7663dc9ecd.tar.gz
Autogenerated HTML docs for v2.18.0-232-gb7bd94
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 0e20a66e7..091eb53fa 100644
--- a/git-rebase.txt
+++ b/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