summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorLibravatar Vladimir Parfinenko <vparfinenko@excelsior-usa.com>2018-06-27 15:57:43 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-27 09:57:49 -0700
commit81d395cc85bb6f04b65d081dae2fd88b750386c9 (patch)
tree1edec084504364bcba123d3a2ae097a85fe042a3 /Documentation/git-rebase.txt
parentsequencer: ensure labels that are object IDs are rewritten (diff)
downloadtgif-81d395cc85bb6f04b65d081dae2fd88b750386c9.tar.xz
rebase: fix documentation formatting
Last sections are squashed into non-formatted block after adding "REBASING MERGES". To reproduce the error see bottom of page: https://git-scm.com/docs/git-rebase Signed-off-by: Vladimir Parfinenko <vparfinenko@excelsior-usa.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
-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 bd5ecff980..6fe98165dc 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