![[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) |
* jh/push-default-upstream-configname:
push.default: Rename 'tracking' to 'upstream'
push.default: Rename 'tracking' to 'upstream'
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/config.txt | patch | | diff1 | | diff2 | | blob | history |
| cache.h | patch | | diff1 | | diff2 | | blob | history |
| config.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/config.txt
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge