Merge branch 'feature/status_against_remote_tracking'

Conflicts:
	vcsh

diff --cc vcsh
index 58ecb7f3ea7415fa4f94c0351985fe11af016161,9d399d4b4d77481e2516437a2da2e52ef382ae3d..246a7da993d5b33a55c73b83ebca193c8bb7d0d5
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -376,13 -327,6 +376,19 @@@ status() 
        fi
  }
  
 +status_helper() {
 +      GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
 +      use
++      remote_tracking_branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2> /dev/null) && {
++              commits_behind=$(git log ..${remote_tracking_branch} --oneline | wc -l)
++              commits_ahead=$(git log ${remote_tracking_branch}.. --oneline | wc -l)
++              [ ${commits_behind} -ne 0 ] && echo "Behind $remote_tracking_branch by $commits_behind commits"
++              [ ${commits_ahead} -ne 0 ] && echo "Ahead of $remote_tracking_branch by $commits_ahead commits"
++      }
 +      git status --short --untracked-files='no'
 +      VCSH_COMMAND_RETURN_CODE=$?
 +}
 +
  upgrade() {
        hook pre-upgrade
        # fake-bare repositories are not bare, actually. Set this to false