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