Code

Merge branch 'ci/forbid-unwanted-current-branch-update'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:19:31 +0000 (21:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:19:31 +0000 (21:19 -0700)
commit1da6d98a9acd2db3902bf432a097771c76f4fd44
treecccdbb4533c6998fbba362569906f24c9f4a87cc
parent67c116bb26b4ee31889e5ee15d6a9d3b7e972b7b
parent587a9ee7da348f5e6696720d770d0e0da597827c
Merge branch 'ci/forbid-unwanted-current-branch-update'

* ci/forbid-unwanted-current-branch-update:
  Show interpreted branch name in error messages
  Prevent force-updating of the current branch
branch.c
builtin/branch.c
builtin/checkout.c