summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:33 -0700
commit2f826b060ce5fb66714de242d9e117ecf0f63676 (patch)
tree6a41de1950028e9d1b318c876f0e784a9caee763
parentMerge branch 'en/rebase-i-microfixes' (diff)
parentrebase: fix documentation formatting (diff)
downloadtgif-2f826b060ce5fb66714de242d9e117ecf0f63676.tar.xz
Merge branch 'js/rebase-recreate-merge'
Docfix. * js/rebase-recreate-merge: rebase: fix documentation formatting
-rw-r--r--Documentation/git-rebase.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 0e20a66e73..091eb53faa 100644
--- 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