From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Jul 2017 22:18:24 +0000 (-0700)
Subject: Merge branch 'ks/fix-rebase-doc-picture'
X-Git-Tag: v2.14.0-rc0~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a5a3c5afcd0de022648c28f51d8912703c56c22f?hp=-c

Merge branch 'ks/fix-rebase-doc-picture'

Doc update.

* ks/fix-rebase-doc-picture:
doc: correct a mistake in an illustration
---

a5a3c5afcd0de022648c28f51d8912703c56c22f
diff --combined Documentation/git-rebase.txt
index a5afd602d8,3290fc5db9..4f6bed61a9
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -12,7 -12,7 +12,7 @@@ SYNOPSI
  	[<upstream> [<branch>]]
  'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
  	--root [<branch>]
 -'git rebase' --continue | --skip | --abort | --edit-todo
 +'git rebase' --continue | --skip | --abort | --quit | --edit-todo
  
  DESCRIPTION
  -----------
@@@ -252,11 -252,6 +252,11 @@@ leave out at most one of A and B, in wh
  	will be reset to where it was when the rebase operation was
  	started.
  
 +--quit::
 +	Abort the rebase operation but HEAD is not reset back to the
 +	original branch. The index and working tree are also left
 +	unchanged as a result.
 +
  --keep-empty::
  	Keep the commits that do not change anything from its
  	parents in the result.
@@@ -370,11 -365,6 +370,11 @@@ default is `--no-fork-point`, otherwis
  	of the rebased commits (see linkgit:git-am[1]).
  	Incompatible with the --interactive option.
  
 +--signoff::
 +	This flag is passed to 'git am' to sign off all the rebased
 +	commits (see linkgit:git-am[1]). Incompatible with the
 +	--interactive option.
 +
  -i::
  --interactive::
  	Make a list of the commits which are about to be rebased.  Let the
@@@ -446,7 -436,7 +446,7 @@@ used to override and disable this setti
  
  --autostash::
  --no-autostash::
 -	Automatically create a temporary stash before the operation
 +	Automatically create a temporary stash entry before the operation
  	begins, and apply it after the operation ends.  This means
  	that you can run rebase on a dirty worktree.  However, use
  	with care: the final stash application after a successful
@@@ -675,7 -665,7 +675,7 @@@ on this 'subsystem'.  You might end up 
  following:
  
  ------------
-     o---o---o---o---o---o---o---o---o  master
+     o---o---o---o---o---o---o---o  master
  	 \
  	  o---o---o---o---o  subsystem
  			   \