Skip to main content

Browse the archive

Revision f1f509cc4504ebe9e2922c7bc61794183e3d441a authored by Junio C Hamano on 21 December 2011, 18:50:20 UTC, committed by Junio C Hamano on 21 December 2011, 18:50:20 UTC 
Merge branch 'ms/commit-cc-option-helpstring' into maint
 
* ms/commit-cc-option-helpstring:
  builtin/commit: add missing '/' in help message
2 parent s 97f261b + ee0400d
Raw File
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
back to top