Skip to content
Newer
Older
100644 38 lines (33 sloc) 918 Bytes
46df82d rebase: extract am code to new source file
Martin von Zweigbergk authored Feb 6, 2011
1 #!/bin/sh
2 #
3 # Copyright (c) 2010 Junio C Hamano.
4 #
5
6 case "$action" in
7 continue)
c5e610b git-rebase--am: remove unnecessary --3way option
Martin von Zweigbergk authored Feb 6, 2011
8 git am --resolved --resolvemsg="$resolvemsg" &&
46df82d rebase: extract am code to new source file
Martin von Zweigbergk authored Feb 6, 2011
9 move_to_original_branch
10 exit
11 ;;
12 skip)
c5e610b git-rebase--am: remove unnecessary --3way option
Martin von Zweigbergk authored Feb 6, 2011
13 git am --skip --resolvemsg="$resolvemsg" &&
46df82d rebase: extract am code to new source file
Martin von Zweigbergk authored Feb 6, 2011
14 move_to_original_branch
15 exit
16 ;;
17 esac
18
19 test -n "$rebase_root" && root_flag=--root
20
90e1818 git-rebase: add keep_empty flag
Neil Horman authored Apr 20, 2012
21 if test -n "$keep_empty"
22 then
23 # we have to do this the hard way. git format-patch completely squashes
24 # empty commits and even if it didn't the format doesn't really lend
25 # itself well to recording empty patches. fortunately, cherry-pick
26 # makes this easy
27 git cherry-pick --allow-empty "$revisions"
28 else
29 git format-patch -k --stdout --full-index --ignore-if-in-upstream \
30 --src-prefix=a/ --dst-prefix=b/ \
31 --no-renames $root_flag "$revisions" |
32 git am $git_am_opt --rebasing --resolvemsg="$resolvemsg"
33 fi && move_to_original_branch
34
46df82d rebase: extract am code to new source file
Martin von Zweigbergk authored Feb 6, 2011
35 ret=$?
84df456 rebase: extract code for writing basic state
Martin von Zweigbergk authored Feb 6, 2011
36 test 0 != $ret -a -d "$state_dir" && write_basic_state
46df82d rebase: extract am code to new source file
Martin von Zweigbergk authored Feb 6, 2011
37 exit $ret
Something went wrong with that request. Please try again.