From: Jari Aalto <jari.aalto@cante.net>
Date: Tue, 05 Feb 2008 13:56:01 GMT
Subject: [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option
Message-ID: <d4rbzevi.fsf@blue.sea.net>

Honor user settable --whitespace=<control>

Signed-off-by: Jari Aalto <jari.aalto AT cante.net>
---
 git-rebase.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index bdcea0e..ec052c4 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -174,7 +174,8 @@ do
 		head_name=$(cat .dotest/head-name) &&
 		onto=$(cat .dotest/onto) &&
 		orig_head=$(cat .dotest/orig-head) &&
-		git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
+		git am $git_am_opt --resolved --3way \
+		    --resolvemsg="$RESOLVEMSG" &&
 		move_to_original_branch
 		exit
 		;;
-- 
1.5.4-rc5.GIT-dirty


-- 
Welcome to FOSS revolution: we fix and modify until it shines