Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 3fe4498197ced84886b4adaddf18f1109b477f8e authored by Junio C Hamano on 03 June 2012, 22:56:05 UTC, committed by Junio C Hamano on 03 June 2012, 22:56:05 UTC 
Git 1.7.11-rc1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 47829ed
Raw File
Tip revision: 3fe4498197ced84886b4adaddf18f1109b477f8e authored by Junio C Hamano on 03 June 2012, 22:56:05 UTC
Git 1.7.11-rc1
Tip revision: 3fe4498
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

if test -n "$keep_empty"
then
	# we have to do this the hard way.  git format-patch completely squashes
	# empty commits and even if it didn't the format doesn't really lend
	# itself well to recording empty patches.  fortunately, cherry-pick
	# makes this easy
	git cherry-pick --allow-empty "$revisions"
else
	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"
fi && move_to_original_branch

ret=$?
test 0 != $ret -a -d "$state_dir" && write_basic_state
exit $ret
back to top