Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 302bd999fd0ef41f3605a2212c23f54ae43649f8 authored by Junio C Hamano on 16 June 2011, 16:21:36 UTC, committed by Junio C Hamano on 16 June 2011, 16:21:36 UTC 
Git 1.7.6-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2c162b5
Raw File
Tip revision: 302bd999fd0ef41f3605a2212c23f54ae43649f8 authored by Junio C Hamano on 16 June 2011, 16:21:36 UTC
Git 1.7.6-rc2
Tip revision: 302bd99
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