summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-13 11:36:36 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-13 11:36:36 -0700
commit69ae92bda13dfbf0b7d169c57b9f2715af2a9d67 (patch)
tree660bdace0e4f761033c60cf230bb49ff00fc5eea /git-rebase.sh
parentbc979945305b87caf1e5975d30d42bafd88ad846 (diff)
downloadgit-69ae92bda13dfbf0b7d169c57b9f2715af2a9d67.tar.gz
shell portability: no "export VAR=VAL"
It is more portable to say "VAR=VAL && export VAR" instead. Noticed by Ævar. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 3335cee70b..e5df23bb83 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -111,7 +111,7 @@ call_merge () {
export GITHEAD_$cmt GITHEAD_$hd
if test -n "$GIT_QUIET"
then
- export GIT_MERGE_VERBOSITY=1
+ GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY
fi
eval 'git-merge-$strategy' $strategy_opts '"$cmt^" -- "$hd" "$cmt"'
rv=$?