diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-10 07:10:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-10 07:10:18 (GMT) |
| commit | f69714c38c6f3296a4bfba0d057e0f1605373f49 (patch) | |
| tree | 2d850f14f62d33ed514e2b197b63fe459ff20d37 /git-cherry | |
| parent | edee414c3e5a546aae3dd1529f397df949713305 (diff) | |
| parent | c35a7b8d806317dc1762e36561cbd31c2530dd9c (diff) | |
| download | git-f69714c38c6f3296a4bfba0d057e0f1605373f49.zip git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.gz git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.bz2 | |
Merge with master.
This merges commit
c35a7b8d806317dc1762e36561cbd31c2530dd9c
from master into our head commit
edee414c3e5a546aae3dd1529f397df949713305
Sincerely,
jit-merge command.
Diffstat (limited to 'git-cherry')
| -rwxr-xr-x | git-cherry | 35 |
1 files changed, 25 insertions, 10 deletions
@@ -3,7 +3,9 @@ # Copyright (c) 2005 Junio C Hamano. # -usage="usage: $0 "'<upstream> [<head>] +. git-sh-setup-script || die "Not a git archive." + +usage="usage: $0 "'[-v] <upstream> [<head>] __*__*__*__*__> <upstream> / @@ -18,29 +20,38 @@ 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 linus >${GIT_DIR-.}/HEAD - git-cherry linus OLD_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 -m "$commit" + git-commit-script -C "$commit" done ' +case "$1" in -v) verbose=t; shift ;; esac + +case "$#,$1" in +1,*..*) + upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$') + set x "$upstream" "$ours" + shift ;; +esac + case "$#" in -1) linus=`git-rev-parse --verify "$1"` && - junio=`git-rev-parse --verify HEAD` || exit +1) upstream=`git-rev-parse --verify "$1"` && + ours=`git-rev-parse --verify HEAD` || exit ;; -2) linus=`git-rev-parse --verify "$1"` && - junio=`git-rev-parse --verify "$2"` || exit +2) upstream=`git-rev-parse --verify "$1"` && + ours=`git-rev-parse --verify "$2"` || exit ;; *) echo >&2 "$usage"; exit 1 ;; esac # Note that these list commits in reverse order; # not that the order in inup matters... -inup=`git-rev-list ^$junio $linus` && -ours=`git-rev-list $junio ^$linus` || exit +inup=`git-rev-list ^$ours $upstream` && +ours=`git-rev-list $ours ^$upstream` || exit tmp=.cherry-tmp$$ patch=$tmp-patch @@ -74,6 +85,10 @@ do else sign=+ fi + case "$verbose" in + t) + c=$(git-rev-list --pretty=oneline --max-count=1 $c) + esac case "$O" in '') O="$sign $c" ;; *) O="$sign $c$LF$O" ;; |