Code

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)
* il/branch-set-upstream:
  branch: warn and refuse to set a branch as a tracking branch of itself.
  Add branch --set-upstream

1  2 
Documentation/git-branch.txt
cache.h

Simple merge
diff --cc cache.h
Simple merge