git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] rebase: fix documentation formatting
@ 2018-06-27  8:57 Vladimir Parfinenko
  2018-06-27 12:01 ` Johannes Schindelin
  0 siblings, 1 reply; 2+ messages in thread
From: Vladimir Parfinenko @ 2018-06-27  8:57 UTC (permalink / raw)
  To: git; +Cc: johannes.schindelin

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(-)

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] rebase: fix documentation formatting
  2018-06-27  8:57 [PATCH] rebase: fix documentation formatting Vladimir Parfinenko
@ 2018-06-27 12:01 ` Johannes Schindelin
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2018-06-27 12:01 UTC (permalink / raw)
  To: Vladimir Parfinenko; +Cc: git

Hi Vlad,

On Wed, 27 Jun 2018, Vladimir Parfinenko wrote:

> 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-06-27 12:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-27  8:57 [PATCH] rebase: fix documentation formatting Vladimir Parfinenko
2018-06-27 12:01 ` Johannes Schindelin

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).