Merge branch 'so/rebase-doc-fork-point'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Oct 2014 17:49:06 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Oct 2014 17:49:07 +0000 (10:49 -0700)
* so/rebase-doc-fork-point:
Documentation/git-rebase.txt: document when --fork-point is auto-enabled

1  2 
Documentation/git-rebase.txt
Simple merge