3 accept_rerere
=t generate
=no
4 while case "$#,$1" in 0,*) break;; *,-*) ;; esac
17 if test -z "$accept_rerere"
22 grep -e "^.+" -e "^+." |
23 grep -e "^..<<<<<<<" -e "^..
=======" -e "^..
>>>>>>>" >/dev/null
27 EDITOR=: git commit -a --no-verify
28 echo "Accepted previous resolution
"
38 git merge "$branch" || accept_rerere || exit
39 if git show-ref -q --verify "refs
/merge-fix
/$branch"
41 git cherry-pick --no-commit "refs
/merge-fix
/$branch" &&
42 EDITOR=: git commit --amend -a
47 git cherry-pick "$branch" || exit ;;
48 *) echo >&2 "Eh?
$branch $eh"; exit ;;
54 x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
55 x40="$x40$x40$x40$x40$x40$x40$x40$x40"
61 "Merge branch
'"*"'"*" into
"*)
62 branch=$(expr "$msg" : "Merge branch
'\(.*\)'")
65 "Merge remote branch
'"*"'"*" into
"*)
66 branch=$(expr "$msg" : "Merge remote branch
'\(.*\)'")
70 echo 2>&1 "Huh?
: $msg"
74 tip=$(git rev-parse --verify "refs
/$merge_hier$branch" 2>/dev/null) &&
75 merged=$(git name-rev --refs="refs
/$merge_hier$branch" "$other" 2>/dev/null) &&
76 merged=$(expr "$merged" : "$x40 \
(.
*\
)") &&
77 test "$merged" != undefined || {
78 other=$(git log -1 --pretty='format:%s' $other) &&
79 merged="$branch :rebased?
$other"
84 merged="$
(git rev-parse
--verify "$commit") pick
$msg"
90 git log --pretty=oneline --first-parent "$1" |
95 if other=$(git rev-parse -q --verify "$commit^
2")
106 series="$merged$LF$series"