diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 10:49:26 -0700 |
| commit | d25a265220f7e9a50693d0ec4bb05c7be0539d69 (patch) | |
| tree | 34bf878cbc1181b0614ad7ba210d48f0ad550fa3 /notes-merge.h | |
| parent | e63f87a6f7a4e55f50e67b112f26d9a1e4e7f3ab (diff) | |
| parent | baf18fc261ca475343fe3cb9cd2c0dded4bc1bb7 (diff) | |
| download | git-d25a265220f7e9a50693d0ec4bb05c7be0539d69.tar.gz | |
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
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions