![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Oct 2011 02:03:19 +0000 (19:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Oct 2011 02:03:19 +0000 (19:03 -0700) | ||
| commit | 0fd8cb3fec7abb36505a150fe5cfa9b1d8b85496 | |
| tree | e8ff37c5dce1e0eb7e33da89d487fcb21bbec6c0 | tree | snapshot |
| parent | 6fdab32e14e2bca05ae6471502bcdfd35b381564 | commit | diff |
| parent | baf18fc261ca475343fe3cb9cd2c0dded4bc1bb7 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| commit.c | diff1 | | diff2 | | blob | history |
| commit.h | diff1 | | diff2 | | blob | history |
| http-push.c | diff1 | | diff2 | | blob | history |
| revision.c | diff1 | | diff2 | | blob | history |