Merge branch 'ks/fix-rebase-doc-picture' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Jul 2017 22:03:39 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Jul 2017 22:03:39 +0000 (15:03 -0700)
Doc update.

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

1  2 
Documentation/git-rebase.txt
Simple merge