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)
commitc736becc94b1d3f026e1144731c17359a755d23f
tree0e7eb7b0a6e93bb0dfc1f93d1e00fdf2f99bd0ef
parent3e52effcf6efa9ef27b3d67d13f535a0381e3bf2
parente892dc713e6b0881320d4c65bff7a49d44752bda
Merge branch 'sb/doc-upstream-branch'

* sb/doc-upstream-branch:
  Documentation: Introduce "upstream branch"
Documentation/config.txt