diff options
| author |  Rene Scharfe <rene.scharfe@lsrfire.ath.cx> | 2006-10-24 01:01:57 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-10-23 20:25:32 -0700 |
| commit | e827633a5d7d627eb1170b2d0c71e944d0d56faf (patch) | |
| tree | 059f497ca4651fef41e9a8063fea75144944e85f /Makefile | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-e827633a5d7d627eb1170b2d0c71e944d0d56faf.tar.xz | |
Built-in cherry
This replaces the shell script git-cherry with a version written in C.
The behaviour of the new version differs from the original in two
points: it has no long help any more, and it is handling the (optional)
third parameter a bit differently. Basically, it does the equivalent
of
ours=`git-rev-list $ours ^$limit ^$upstream`
instead of
ours=`git-rev-list $ours ^$limit`
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -157,7 +157,7 @@ BASIC_LDFLAGS = SCRIPT_SH = \ git-bisect.sh git-branch.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 \ @@ -210,7 +210,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)) |