| commit | d25a265220f7e9a50693d0ec4bb05c7be0539d69 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Oct 2011 17:49:26 +0000 (21 10:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Oct 2011 17:49:26 +0000 (21 10:49 -0700) | ||
| tree | 34bf878cbc1181b0614ad7ba210d48f0ad550fa3 | treesnapshot (tar.gz zip) |
| parent | e63f87a6f7a4e55f50e67b112f26d9a1e4e7f3ab | commitdiff |
| parent | baf18fc261ca475343fe3cb9cd2c0dded4bc1bb7 | commitdiff |
Merge branch 'nd/maint-autofix-tag-in-head' into maint
* 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
* 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