summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2c67419)
raw | patch | inline | side by side (parent: 2c67419)
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Thu, 20 Oct 2005 15:13:24 +0000 (17:13 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Fri, 21 Oct 2005 05:32:07 +0000 (22:32 -0700) |
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>
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>
.gitignore | patch | blob | history | |
Makefile | patch | blob | history |
diff --git a/.gitignore b/.gitignore
index 975e773fec56c7cf747f73b4822bffb017e2e79f..52cb9e2c08ce3b77d9a39e461b410759bfe402f0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
git-checkout
git-checkout-index
git-cherry
+git-cherry-pick
git-clone
git-clone-pack
git-commit
diff --git a/Makefile b/Makefile
index 5ee72bc9248cea430fd28bbe16076f72dcb8ac1d..903c57cdaf2769b323f4da8a7de3eb5bb3f8cca9 100644 (file)
--- a/Makefile
+++ b/Makefile
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
$@.py >$@
chmod +x $@
+git-cherry-pick: git-revert
+ cp $< $@
+
%.o: %.c
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
%.o: %.S
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))