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

gitster · gitster · commit bae7e3f153f9 · 2017-07-21T15:03:39.000-07:00
Doc update.

* ks/fix-rebase-doc-picture:
  doc: correct a mistake in an illustration
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
@@ -675,7 +675,7 @@ on this 'subsystem'.  You might end up with a history like the
 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
 			   \

Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ on this 'subsystem'. You might end up with a history like the`
`675`	`675`	`following:`
`676`	`676`
`677`	`677`	`------------`
`678`		`- o---o---o---o---o---o---o---o---o master`
	`678`	`+ o---o---o---o---o---o---o---o master`
`679`	`679`	`\`
`680`	`680`	`o---o---o---o---o subsystem`
`681`	`681`	`\`