summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-13 20:20:09 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-13 20:20:09 -0700
commit38a18873b21f6f2eebedc65aff2249fd6ec2168c (patch)
tree5f7d8cce901a2317a8fbdef7bce2fb85742be1fc /git-am.sh
parent2794ad524462c4e2ecd4573d650e7b4f8da89a5d (diff)
parent352953a556e7f8d720e26a32d4aabbf823d3c4d4 (diff)
downloadgit-38a18873b21f6f2eebedc65aff2249fd6ec2168c.tar.gz
Merge branch 'maint'
* maint: Better advice on using topic branches for kernel development Documentation: update implicit "--no-index" behavior in "git diff" Documentation: expand 'git diff' SEE ALSO section Documentation: diff can compare blobs Documentation: gitrevisions is in section 7 shell portability: no "export VAR=VAL" CodingGuidelines: reword parameter expansion section Documentation: update-index: -z applies also to --index-info Documentation: No argument of ALLOC_GROW should have side-effects
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 9317b38935..10436dcad5 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