threads / patch / 48789

patchrebase: fix documentation formatting

Subject: [PATCH] rebase: fix documentation formatting

## tl;dr

2 messages between Jun 27, 2018 and Jun 27, 2018. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Vladimir Parfinenko· Jun 27, 2018, 08:57 UTC · lore

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>
---
 Documentation/git-rebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/git-rebase.txt +1 −1
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index bd5ecff98..6fe98165d 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
--
2.18.0.windows.1
Johannes Schindelin· Jun 27, 2018, 12:01 UTC · re: Vladimir Parfinenko · lore

Re: [PATCH] rebase: fix documentation formatting

Hi Vlad,
On Wed, 27 Jun 2018, Vladimir Parfinenko wrote:
Show 6 quoted lines
> 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>
ACK!

Thank you so much for fixing this (as you may suspect, I forgot to adjust the length of the "underline" after changing the header from "RECREATING MERGES" to "REBASING MERGES"), Johannes

← back to recent threads