]> git.tokkee.org Git - git.git/commitdiff
[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbfeeaf 53c4031)
Merge branch 'jh/push-default-upstream-configname'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:31 +0000 (21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:31 +0000 (21:58 -0800)
* jh/push-default-upstream-configname:
  push.default: Rename 'tracking' to 'upstream'

1  2 
cache.h patch | diff1 | diff2 | blob | history
config.c patch | diff1 | diff2 | blob | history

diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
Git - the stupid content tracker