Junio C Hamano 0fd8cb3fec Merge branch 'nd/maint-autofix-tag-in-head' ...

* 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

2011-10-13 19:03:19 -07:00

5.9 KiB

Raw Blame History

View Raw