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

Doc update.

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

diff --combined Documentation/git-rebase.txt
index 53f4e144444ae7b30ce2634c0f364400927b27d2,3290fc5db9168b55e7d633ed590be1ce10c3eb94..652a99062c8820352593f3461f0975cb10f3d6c2
--- 1/Documentation/git-rebase.txt
--- 2/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
@@@ -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
                           \