Merge branch 'jn/branch-move-to-self'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:53:08 +0000 (22:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:53:08 +0000 (22:53 -0800)
commitb2dd02112052aff875e8dc7d12b9915c91feafe2
tree575640076625dbc13dd950e78f8c0ab5f23e2b06
parenta96a89f7153150c7e59d5481dd22773173b5a877
parent39bd6f726109942c6f77f59638f6763c9f00706c
Merge branch 'jn/branch-move-to-self'

* 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"
branch.c
branch.h
builtin/branch.c
builtin/checkout.c