Merge branch 'master' of https://github.com:/harisekhon/bash-tools

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(){

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

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

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