Code

Merge branch 'sb/doc-upstream-branch'
authorJunio C Hamano <gitster@pobox.com>
Sun, 12 Apr 2009 23:46:42 +0000 (16:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 12 Apr 2009 23:46:42 +0000 (16:46 -0700)
* sb/doc-upstream-branch:
  Documentation: Introduce "upstream branch"

1  2 
Documentation/config.txt

Simple merge