summaryrefslogtreecommitdiff
path: root/git-cherry
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-27 00:27:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-29 19:52:03 (GMT)
commite47e35acdda5e334befcde6ffaf207cb5a63b6f4 (patch)
tree6088772d6e7913f68df719f8e2b2050fb9bbca5d /git-cherry
parent48313592bf318139b39d6017a863f27420e3939a (diff)
downloadgit-e47e35acdda5e334befcde6ffaf207cb5a63b6f4.zip
git-e47e35acdda5e334befcde6ffaf207cb5a63b6f4.tar.gz
git-e47e35acdda5e334befcde6ffaf207cb5a63b6f4.tar.bz2
Remove git-apply-patch-script.
Now the rebase is rewritten to use git cherry-pick, there is no user for that ancient script. I've checked Cogito and StGIT to make sure they do not use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-cherry')
-rwxr-xr-xgit-cherry16
1 files changed, 3 insertions, 13 deletions
diff --git a/git-cherry b/git-cherry
index e186363..fe8c109 100755
--- a/git-cherry
+++ b/git-cherry
@@ -14,19 +14,9 @@ usage="usage: $0 "'[-v] <upstream> [<head>]
Each commit between the fork-point and <head> is examined, and
compared against the change each commit between the fork-point and
-<upstream> introduces. If the change does not seem to be in the
-upstream, it is shown on the standard output.
-
-The output is intended to be used as:
-
- OLD_HEAD=$(git-rev-parse HEAD)
- git-rev-parse upstream >${GIT_DIR-.}/HEAD
- git-cherry upstream $OLD_HEAD |
- while read commit
- do
- GIT_EXTERNAL_DIFF=git-apply-patch-script git-diff-tree -p "$commit" &&
- git-commit-script -C "$commit"
- done
+<upstream> introduces. If the change seems to be in the upstream,
+it is shown on the standard output with prefix "+". Otherwise
+it is shown with prefix "-".
'
case "$1" in -v) verbose=t; shift ;; esac