Merge branch 'js/refer-upstream'
commit4ca1b623865a9dc100f95a7867e35a9f73d7507a
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Jan 2010 00:08:13 +0000 (22 16:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Jan 2010 00:08:13 +0000 (22 16:08 -0800)
treef9ad811bb2e2b5b612a4b756707c9d3483e97366
parentc6ec7efdd4c63f5c53184651cb05748e7bc71075
parentae0ba8e20a2fb57299381ba2daa7c6d1863320d0
Merge branch 'js/refer-upstream'

* js/refer-upstream:
  Teach @{upstream} syntax to strbuf_branchanme()
  t1506: more test for @{upstream} syntax
  Introduce <branch>@{upstream} notation
Documentation/git-rev-parse.txt
sha1_name.c