![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 16 Mar 2011 23:47:26 +0000 (16:47 -0700) | ||
| commit | 61a6f1faecf19d7727bdfae012a14747c672cb1a | |
| tree | 414004f8e28dfbd74f37ed161bc0dd491219b01e | tree | snapshot |
| parent | 7633a5ab9a33f90fc0fb912d7403f6c21c5435c1 | commit | diff |
| parent | 53c403116a947c538132fc721f83196036f7a299 | commit | diff |
Merge branch 'jh/push-default-upstream-configname' into maint
* jh/push-default-upstream-configname:
push.default: Rename 'tracking' to 'upstream'
* jh/push-default-upstream-configname:
push.default: Rename 'tracking' to 'upstream'
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| config.c | diff1 | | diff2 | | blob | history |