Merge branch 'jk/maint-fast-import-doc-reorder' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:59:46 +0000 (07:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:59:46 +0000 (07:59 -0800)
commit267aaa08e2e9b236d4ace006055066e353af8038
tree2829d21d9ef6e0c9017b5e9c4dc4468683bddb56
parent74abc17f9152e440c4cc672f41473604ed46f60d
parent29b1b21f07f8d9b1778a4f3df690e004832d4be8
Merge branch 'jk/maint-fast-import-doc-reorder' into maint

* 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