summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-25 09:22:59 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 23:52:16 (GMT)
commit93c36dcd0a4f6373e3a02a8505046801106ddb85 (patch)
treeec88717199a8ff438bba967b49e4b759a956471d /Makefile
parent5fec3ef101c0f18bbf2400423dc70e686e9d25b0 (diff)
downloadgit-93c36dcd0a4f6373e3a02a8505046801106ddb85.zip
git-93c36dcd0a4f6373e3a02a8505046801106ddb85.tar.gz
git-93c36dcd0a4f6373e3a02a8505046801106ddb85.tar.bz2
[PATCH] git-cherry: find commits not merged upstream.
The git-cherry command helps the git-rebase script by finding commits that have not been merged upstream. Commits already included in upstream are prefixed with '-' (meaning "drop from my local pull"), while commits missing from upstream are prefixed with '+' (meaning "add to the updated upstream"). 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 89f6f93..51d0b26 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
+ gitk git-cherry
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 \