Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
pull: Remove --tags option from manpage
[gitweb.git]
/
git-am.sh
diff --git
a/git-am.sh
b/git-am.sh
index 6184101c2b0a6c4661210b6615b1ffcc1d1c2215..de116a29ef091a23f60603a28f1260ba60f054ac 100755
(executable)
--- 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