Merge branch 'jn/branch-move-to-self' into maint
commit79587741cbed7704d2e7213c999cf2841af3000d
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:33 +0000 (28 11:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:33 +0000 (28 11:32 -0800)
treeac065e7bd784619dbc5cc47e543860b57f71adb3
parente39888ba21b68888e1db2d989155f23ea78fc842
parent39bd6f726109942c6f77f59638f6763c9f00706c
Merge branch 'jn/branch-move-to-self' into maint

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