+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
+
+# git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+# if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+# test_or_die "git pull"
+
+
+#let's start over clean here...
+
+ git remote update
+ test_or_die "git remote update"
+
+ git pull origin
+#--no-ff
+ test_or_die "git fetch origin"
+
+# from: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
+UPSTREAM=$(parent_branch_name)
+#argh: original UPSTREAM='${1:-'\''@{u}'\''}'
+LOCAL=$(git rev-parse @)
+REMOTE=$(git rev-parse "$UPSTREAM")
+BASE=$(git merge-base @ "$UPSTREAM")
+var UPSTREAM LOCAL REMOTE BASE
+
+if [ "$LOCAL" == "$REMOTE" ]; then
+ echo "Up-to-date"
+elif [ "$LOCAL" == "$BASE" ]; then
+ echo "Need to pull"
+elif [ "$REMOTE" == "$BASE" ]; then
+ echo "Need to push"
+else
+ echo "Diverged"
+fi
+
+echo The rest of pull is not done yet.
+
+
+# reslog=$(git log HEAD..origin/master --oneline)
+# if [[ "${reslog}" != "" ]] ; then
+# git merge origin/master