summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-25 09:23:43 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 23:52:16 (GMT)
commit59e6b23acef9d29b9bdabc38ee80361e19ef7ebe (patch)
tree32e674e352960114da7940e79f7ba1d23d3c818e /Makefile
parent93c36dcd0a4f6373e3a02a8505046801106ddb85 (diff)
downloadgit-59e6b23acef9d29b9bdabc38ee80361e19ef7ebe.zip
git-59e6b23acef9d29b9bdabc38ee80361e19ef7ebe.tar.gz
git-59e6b23acef9d29b9bdabc38ee80361e19ef7ebe.tar.bz2
[PATCH] git-rebase-script: rebase local commits to new upstream head.
Using git-cherry, forward port local commits missing from the new upstream head. This also depends on "-m" flag support in git-commit-script. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 51d0b26..d9aae01 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
git-deltafy-script git-fetch-script git-status-script git-commit-script \
git-log-script git-shortlog git-cvsimport-script git-diff-script \
git-reset-script git-add-script git-checkout-script git-clone-script \
- gitk git-cherry
+ gitk git-cherry git-rebase-script
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-read-tree git-commit-tree git-cat-file git-fsck-cache \