-#let's start over clean here...
-
- git fetch origin
- test_or_die "git fetch origin"
-
- git remote update
- test_or_die "git remote update"
-
-# 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
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.