Merge branch 'jk/maint-fast-import-doc-reorder'
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:35:07 +0000 (18:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:35:08 +0000 (18:35 -0800)
commita96e8078a9135f54052ceb93c26adf4b863780ae
treec2b8b3dc917e426af37c0a19a1afcbeb62a98b38
parent79637a44f7d24b46a748c0ba8028d61325ba54e0
parent29b1b21f07f8d9b1778a4f3df690e004832d4be8
Merge branch 'jk/maint-fast-import-doc-reorder'

* 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