Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint
commite9ab76da8f9ec1b4312de87bc68a1c4bcbf10329
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:17 +0000 (21 12:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2015 19:12:17 +0000 (21 12:12 -0700)
tree1cc8c75f4b7e5d4de5d0eb3c843e0cc9925310fe
parent52735a689270bb1de94eb3de198594b36caed9bb
parent9585cb8d964a1f17895d58b280b5adf62265be53
Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint

Documentation update.

* jn/doc-fast-import-no-16-octopus-limit:
  fast-import doc: remove suggested 16-parent limit
Documentation/git-fast-import.txt