X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=git-rebase--am.sh;h=319933e70a34f9da4ec93d063eb102eff33b6787;hb=b8a4e894d42dd3b1c5dfa90e68ffaee5ab27dcc2;hp=375239341fbfe885e51a25e9e0dc2d4fee791345;hpb=57009b1dd9ac63b0cb0d9f5a78f69ce4e5837768;p=git-core%2Fgit.git

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 375239341..319933e70 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -45,7 +45,7 @@ then
 	# itself well to recording empty patches.  fortunately, cherry-pick
 	# makes this easy
 	git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty \
-		--right-only "$revisions" \
+		$allow_rerere_autoupdate --right-only "$revisions" \
 		${restrict_revision+^$restrict_revision}
 	ret=$?
 else
@@ -82,6 +82,7 @@ else
 	fi
 
 	git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
+		$allow_rerere_autoupdate \
 		${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
 	ret=$?