diff --git a/git.sh b/git.sh
index ba3215dd..a349c5c0 100755
--- a/git.sh
+++ b/git.sh
@@ -29,7 +29,7 @@ allbranches(){
     fi
     # this only shows local branches, to show all remote ones do
     # git ls-remote | awk '/\/heads\//{print $2}' | sed 's,refs/heads/,,'
-    eval git branch -a | clean_branch_name | $uniq
+    git branch -a | clean_branch_name | eval $uniq
 }
 
 clean_branch_name(){
diff --git a/git_merge_all.sh b/git_merge_all.sh
index 5358a05a..3ad34b41 100755
--- a/git_merge_all.sh
+++ b/git_merge_all.sh
@@ -19,6 +19,10 @@ srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 . "$srcdir/git.sh"
 
+# For Git < 2.0 may need to set:
+#
+# git config merge.defaultToUpstream true
+
 foreachbranch 'git merge --no-edit'
 
 git checkout master
diff --git a/git_merge_master.sh b/git_merge_master.sh
index 23e47357..aa64b276 100755
--- a/git_merge_master.sh
+++ b/git_merge_master.sh
@@ -19,6 +19,10 @@ srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 . "$srcdir/git.sh"
 
+# For Git < 2.0 may need to set:
+#
+# git config merge.defaultToUpstream true
+
 foreachbranch 'git merge --no-edit && git merge master --no-edit'
 
 git checkout master
diff --git a/git_merge_master_pull.sh b/git_merge_master_pull.sh
index ef776e4b..006ea1df 100755
--- a/git_merge_master_pull.sh
+++ b/git_merge_master_pull.sh
@@ -19,6 +19,10 @@ srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 . "$srcdir/git.sh"
 
+# For Git < 2.0 may need to set:
+#
+# git config merge.defaultToUpstream true
+
 foreachbranch 'git fetch && git merge --no-edit && git merge master --no-edit'
 
 git checkout master