Merge branch 'ci/forbid-unwanted-current-branch-update'
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Sep 2011 04:48:10 +0000 (21:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Sep 2011 04:48:10 +0000 (21:48 -0700)
commitc103e9529c8a95b5acf4747cfe06b2f6adedab71
treec57aadfd0da7010b5a916e21dd3b4d239b28ac62
parent26e4266f2fee3454370885ff480b38d045ca1731
parentfa79937675600ad5dda5031c532097a0461d843e
Merge branch 'ci/forbid-unwanted-current-branch-update'

* ci/forbid-unwanted-current-branch-update:
  branch --set-upstream: regression fix
branch.c
builtin/branch.c
builtin/checkout.c