Staging
v0.5.1
v0.5.1
Revision 4d2440fe0daa9ad1556dfd220af8b3a883cf849d authored by Junio C Hamano on 17 November 2011, 19:06:15 UTC, committed by Junio C Hamano on 17 November 2011, 19:06:15 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 09116a1
git-rebase--am.sh
#!/bin/sh
#
# Copyright (c) 2010 Junio C Hamano.
#
. git-sh-setup
case "$action" in
continue)
git am --resolved --resolvemsg="$resolvemsg" &&
move_to_original_branch
exit
;;
skip)
git am --skip --resolvemsg="$resolvemsg" &&
move_to_original_branch
exit
;;
esac
test -n "$rebase_root" && root_flag=--root
git format-patch -k --stdout --full-index --ignore-if-in-upstream \
--src-prefix=a/ --dst-prefix=b/ \
--no-renames $root_flag "$revisions" |
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" &&
move_to_original_branch
ret=$?
test 0 != $ret -a -d "$state_dir" && write_basic_state
exit $ret
Computing file changes ...