diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-26 17:27:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-29 12:52:03 -0700 |
| commit | e47e35acdda5e334befcde6ffaf207cb5a63b6f4 (patch) | |
| tree | 6088772d6e7913f68df719f8e2b2050fb9bbca5d /git-cherry | |
| parent | Redo "revert" using three-way merge machinery. (diff) | |
| download | tgif-e47e35acdda5e334befcde6ffaf207cb5a63b6f4.tar.xz | |
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-x | git-cherry | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/git-cherry b/git-cherry index e186363647..fe8c1090e9 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 |