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

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

Junio C Hamano committed Jul 21, 2017 at 15:03 UTC bae7e3f153f90b96438e6972e31c540ae9cf8ca0

No changes.