undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-rebase--am: remove unnecessary --3way option

Browse Source 
Since 22db240 (git-am: propagate --3way options as well, 2008-12-04),
the --3way has been propageted across failure, so it is since
pointless to pass it to git-am when resuming.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin von Zweigbergk 2011-02-06 13:43:58 -05:00 committed by Junio C Hamano
parent b325680930
commit c5e610be50
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--am.sh
View File

@ -7,12 +7,12 @@
case "$action" in case "$action" in
continue) continue)
git am --resolved --3way --resolvemsg="$resolvemsg" && git am --resolved --resolvemsg="$resolvemsg" &&
move_to_original_branch move_to_original_branch
exit exit
;; ;;
skip) skip)
git am --skip -3 --resolvemsg="$resolvemsg" && git am --skip --resolvemsg="$resolvemsg" &&
move_to_original_branch move_to_original_branch
exit exit
;; ;;