summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-07 03:33:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-07 03:33:22 (GMT)
commit41dc7e004491725e74e3fdd1c364b4c0a234574b (patch)
treed4a177ce56cfb96e15151e26fbec37c2ea2400de /Makefile
parenta7fd83b0b06c518c90b59836264cf93efce0795f (diff)
parent9981b6d915a49d325f790f2aa825aa56ae4ac85c (diff)
downloadgit-41dc7e004491725e74e3fdd1c364b4c0a234574b.zip
git-41dc7e004491725e74e3fdd1c364b4c0a234574b.tar.gz
git-41dc7e004491725e74e3fdd1c364b4c0a234574b.tar.bz2
Merge branch 'master' of git://repo.or.cz/git/fastimport
* 'master' of git://repo.or.cz/git/fastimport: (81 commits) S_IFLNK != 0140000 Don't do non-fastforward updates in fast-import. Support RFC 2822 date parsing in fast-import. Minor fast-import documentation corrections. Remove unnecessary null pointer checks in fast-import. Correct fast-import timezone documentation. Correct minor style issue in fast-import. Correct compiler warnings in fast-import. Remove --branch-log from fast-import. Initial draft of fast-import documentation. Don't support shell-quoted refnames in fast-import. Reduce memory usage of fast-import. Include checkpoint command in the BNF. Accept 'inline' file data in fast-import commit structure. Reduce value duplication in t9300-fast-import. Create test case for fast-import. Support delimited data regions in fast-import. Remove unnecessary options from fast-import. Use fixed-size integers when writing out the index in fast-import. Always use struct pack_header for pack header in fast-import. ...
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index fc98b27..2407bbe 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
PROGRAMS = \
git-convert-objects$X git-fetch-pack$X git-fsck$X \
git-hash-object$X git-index-pack$X git-local-fetch$X \
+ git-fast-import$X \
git-merge-base$X \
git-daemon$X \
git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \