Code

Merge branch 'jn/branch-move-to-self' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:33 +0000 (11:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:33 +0000 (11:32 -0800)
* jn/branch-move-to-self:
  Allow checkout -B <current-branch> to update the current branch
  branch: allow a no-op "branch -M <current-branch> HEAD"

1  2 
builtin/branch.c
builtin/checkout.c

Simple merge
Simple merge