Andrew's git / gitweb.git / diff
?
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 patch | diff1 | diff2 | blob | history
builtin/checkout.c patch | diff1 | diff2 | blob | history
diff --cc builtin/branch.c
Simple merge
diff --cc builtin/checkout.c
Simple merge