Merge branch 'nd/maint-autofix-tag-in-head' into next
commitc083e6915df9016f35ab5696cd78f0c7b529dc2e
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:41:54 +0000 (6 15:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:41:54 +0000 (6 15:41 -0700)
treec93c3b307086f050cf0044e2274697afc08d2e6d
parente3cbb9018539b08e77e9b8b5f76871b0807e2e1a
parentbaf18fc261ca475343fe3cb9cd2c0dded4bc1bb7
Merge branch 'nd/maint-autofix-tag-in-head' into next

* nd/maint-autofix-tag-in-head:
  Accept tags in HEAD or MERGE_HEAD
  merge: remove global variable head[]
  merge: use return value of resolve_ref() to determine if HEAD is invalid
  merge: keep stash[] a local variable

Conflicts:
builtin/merge.c
builtin/commit.c
builtin/merge.c
commit.c
commit.h
http-push.c
revision.c