Merge branch 'jh/push-default-upstream-configname' into maint
commit61a6f1faecf19d7727bdfae012a14747c672cb1a
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16 16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16 16:47 -0700)
tree414004f8e28dfbd74f37ed161bc0dd491219b01e
parent7633a5ab9a33f90fc0fb912d7403f6c21c5435c1
parent53c403116a947c538132fc721f83196036f7a299
Merge branch 'jh/push-default-upstream-configname' into maint

* jh/push-default-upstream-configname:
  push.default: Rename 'tracking' to 'upstream'
Documentation/config.txt
cache.h
config.c