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

Doc update.

* ks/fix-rebase-doc-picture:
  doc: correct a mistake in an illustration
Documentation/git-rebase.txt