X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=5f249485df230bed0d2a620104369260b0ac8b66;hb=9fbd8986bb475befb27e0597c2ce0a7ce015334c;hp=e7f008c7baae2ff484e16882e199b6b9d75195aa;hpb=ea56a7ed971f3bd547abb16a3cb9a41c00133c85;p=git.git diff --git a/git-am.sh b/git-am.sh index e7f008c7b..5f249485d 100755 --- a/git-am.sh +++ b/git-am.sh @@ -137,7 +137,7 @@ It does not apply to blobs recorded in its index." export GITHEAD_$his_tree if test -n "$GIT_QUIET" then - export GIT_MERGE_VERBOSITY=0 + GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY fi git-merge-recursive $orig_tree -- HEAD $his_tree || { git rerere $allow_rerere_autoupdate