Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
bisect: visualize with git-log if gitk is unavailable
[gitweb.git]
/
git-stash.sh
diff --git
a/git-stash.sh
b/git-stash.sh
index 5fb1245ea74a3029790c4c7886f9c6a32bddaa13..7561b374d2ec90fe774e98e39a121a1a3a3cdfa9 100755
(executable)
--- a/
git-stash.sh
+++ b/
git-stash.sh
@@
-373,7
+373,7
@@
apply_stash () {
if test -n "$GIT_QUIET"
then
- export GIT_MERGE_VERBOSITY=0
+ GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
fi
if git merge-recursive $b_tree -- $c_tree $w_tree
then