diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-01 09:17:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-01 09:17:37 -0800 |
| commit | 56532fa147d56057ad4121f5ccea8e254748afdd (patch) | |
| tree | f5536ca0d7ba9ca232ea606ebc6f501d396a4b98 /Makefile | |
| parent | e0d68cd5d95fc15342db38c211f71efe5bcfbe94 (diff) | |
| parent | 2b60356da5369dd60ab26eabaa91d95b6badf209 (diff) | |
| download | git-56532fa147d56057ad4121f5ccea8e254748afdd.tar.gz git-56532fa147d56057ad4121f5ccea8e254748afdd.tar.xz | |
Merge branch 'rs/cherry'
* rs/cherry:
Make git-cherry handle root trees
Built-in cherry
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -159,7 +159,7 @@ BASIC_LDFLAGS = SCRIPT_SH = \ git-bisect.sh git-checkout.sh \ - git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \ + git-clean.sh git-clone.sh git-commit.sh \ git-fetch.sh \ git-ls-remote.sh \ git-merge-one-file.sh git-parse-remote.sh \ @@ -212,7 +212,7 @@ PROGRAMS = \ EXTRA_PROGRAMS = BUILT_INS = \ - git-format-patch$X git-show$X git-whatchanged$X \ + git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \ git-get-tar-commit-id$X \ $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS)) |