Merge branch 'mh/fast-import-get-mark'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:23 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:23 +0000 (11:01 -0700)
"git fast-import" learned to respond to the get-mark command via
its cat-blob-fd interface.

* mh/fast-import-get-mark:
fast-import: add a get-mark command

1  2 
Documentation/git-fast-import.txt
fast-import.c
Simple merge
diff --cc fast-import.c
Simple merge