Merge branch 'so/rebase-doc-fork-point'
commit792a5723207330f473d64f0c6e32a17e5535a265
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Oct 2014 17:49:06 +0000 (14 10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Oct 2014 17:49:07 +0000 (14 10:49 -0700)
treecb3a4d3ed6b09b9b1b5d209faed7ab5a2b12c84b
parent211836f77bc85eafe5c24fcbd70cd7583ce68328
parentf51a48ec3aacaa01357c891c79dfc45aae0efeff
Merge branch 'so/rebase-doc-fork-point'

* so/rebase-doc-fork-point:
  Documentation/git-rebase.txt: document when --fork-point is auto-enabled
Documentation/git-rebase.txt