Merge branch 'jh/push-default-upstream-configname'

* jh/push-default-upstream-configname:
  push.default: Rename 'tracking' to 'upstream'

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge