Merge branch 'il/branch-set-upstream'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Jan 2010 00:08:05 +0000 (16:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Jan 2010 00:08:05 +0000 (16:08 -0800)
commit1a545d0b5fa56a7be88fe082cec7847715079a18
tree721ec8d309c6aea0fa3a80eea8d5c1ad07f6bed1
parent67bc7407211d26de518811dafc2c1cf2e6124709
parent85e2233f982f760d0e731b1258da2580834d8027
Merge branch 'il/branch-set-upstream'

* il/branch-set-upstream:
  branch: warn and refuse to set a branch as a tracking branch of itself.
  Add branch --set-upstream
Documentation/git-branch.txt
cache.h