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

Doc update.

* ks/fix-rebase-doc-picture:
  doc: correct a mistake in an illustration
maint
Junio C Hamano 2017-07-21 15:03:39 -07:00
commit bae7e3f153
1 changed files with 1 additions and 1 deletions

View File

@ -675,7 +675,7 @@ on this 'subsystem'. You might end up with a history like the
following: 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 o---o---o---o---o subsystem
\ \