diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-10-20 17:13:24 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-10-20 22:32:07 -0700 |
| commit | 4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff (patch) | |
| tree | a62bc6292b70ea9d3bf568090b7b5051a68e1762 | |
| parent | Fix missing exports in git-am (diff) | |
| download | tgif-4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff.tar.xz | |
Make git-cherry-pick in target "all"
Since git-cherry-pick is simply a copy of git-revert, it can be created
before installing (so that it can be used without installing, too).
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 975e773fec..52cb9e2c08 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ git-check-ref-format git-checkout git-checkout-index git-cherry +git-cherry-pick git-clone git-clone-pack git-commit @@ -310,7 +310,7 @@ DEFINES += -DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER)) SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ - gitk + gitk git-cherry-pick export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir ### Build rules @@ -351,6 +351,9 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py $@.py >$@ chmod +x $@ +git-cherry-pick: git-revert + cp $< $@ + %.o: %.c $(CC) -o $*.o -c $(ALL_CFLAGS) $< %.o: %.S @@ -410,7 +413,6 @@ check: install: $(PROGRAMS) $(SCRIPTS) $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir)) $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir)) - $(INSTALL) git-revert $(call shellquote,$(DESTDIR)$(bindir)/git-cherry-pick) sh ./cmd-rename.sh $(call shellquote,$(DESTDIR)$(bindir)) $(MAKE) -C templates install $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR)) |