# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2005 Junio C Hamano
#
-. git-sh-setup
case "$0" in
*-revert* )
test -t 0 && edit=-e
- me=revert ;;
+ me=revert
+ USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
*-cherry-pick* )
edit=
- me=cherry-pick ;;
+ me=cherry-pick
+ USAGE='[--edit] [-n] [-r] <commit-ish>' ;;
* )
die "What are you talking about?" ;;
esac
-
-usage () {
- case "$me" in
- cherry-pick)
- die "usage git $me [--edit] [-n] [-r] <commit-ish>"
- ;;
- revert)
- die "usage git $me [--edit | --no-edit] [-n] <commit-ish>"
- ;;
- esac
-}
+. git-sh-setup
no_commit= replay=
while case "$#" in 0) break ;; esac
cherry-pick)
pick_author_script='
/^author /{
+ s/'\''/'\''\\'\'\''/g
h
s/^author \([^<]*\) <[^>]*> .*$/\1/
s/'\''/'\''\'\'\''/g
# $prev and $commit on top of us (when cherry-picking or replaying).
echo >&2 "First trying simple merge strategy to $me."
-git-read-tree -m -u $base $head $next &&
+git-read-tree -m -u --aggressive $base $head $next &&
result=$(git-write-tree 2>/dev/null) || {
echo >&2 "Simple $me fails; trying Automatic $me."
git-merge-index -o git-merge-one-file -a || {
- echo >&2 "Automatic $me failed. After fixing it up,"
- echo >&2 "you can use \"git commit -F .msg\""
+ echo >&2 "Automatic $me failed. After resolving the conflicts,"
+ echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
+ echo >&2 "and commit with 'git commit -F .msg'"
case "$me" in
cherry-pick)
echo >&2 "You may choose to use the following when making"