Merge branch 'jk/maint-fast-import-doc-dedup-done' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:48:39 +0000 (07:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 15:48:39 +0000 (07:48 -0800)
commit7b9ea42b3cb91cc5463ac73610dbc3285e20b400
tree1ab023a082b6464d462a9b3e492eab9317f70920
parentf2f5449379efca7635cbcc65aab3d82ac29897aa
parent850bc56defe2abf68ce26c5c80761d3df59c2ba7
Merge branch 'jk/maint-fast-import-doc-dedup-done' into maint

* jk/maint-fast-import-doc-dedup-done:
  git-fast-import(1): remove duplicate '--done' option
Documentation/git-fast-import.txt