Merge branch 'jk/maint-fast-import-doc-reorder' into next
commit9f3950dacbde719a8cc09136ebca5955178364e0
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 22:40:38 +0000 (10 14:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 22:40:38 +0000 (10 14:40 -0800)
tree0ad0d31326731a587451ab39887e25bb318674c0
parentc79898a0465fcb2630ca51fbec92982885c390b4
parent29b1b21f07f8d9b1778a4f3df690e004832d4be8
Merge branch 'jk/maint-fast-import-doc-reorder' into next

* jk/maint-fast-import-doc-reorder:
  git-fast-import(1): reorganise options
  git-fast-import(1): combine documentation of --[no-]relative-marks
Documentation/git-fast-import.txt