From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jul 2018 19:20:33 +0000 (-0700)
Subject: Merge branch 'js/rebase-recreate-merge'
X-Git-Tag: v2.19.0-rc0~150
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2f826b060ce5fb66714de242d9e117ecf0f63676?ds=inline;hp=-c

Merge branch 'js/rebase-recreate-merge'

Docfix.

* js/rebase-recreate-merge:
rebase: fix documentation formatting
---

2f826b060ce5fb66714de242d9e117ecf0f63676
diff --combined Documentation/git-rebase.txt
index 0e20a66e73,6fe98165dc..091eb53faa
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -8,9 -8,9 +8,9 @@@ git-rebase - Reapply commits on top of 
  SYNOPSIS
  --------
  [verse]
 -'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
 +'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
  	[<upstream> [<branch>]]
 -'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
 +'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
  	--root [<branch>]
  'git rebase' --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch
  
@@@ -804,7 -804,7 +804,7 @@@ The ripple effect of a "hard case" reco
  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