diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:19 -0700 |
| commit | 0fd8cb3fec7abb36505a150fe5cfa9b1d8b85496 (patch) | |
| tree | e8ff37c5dce1e0eb7e33da89d487fcb21bbec6c0 /fast-import.c | |
| parent | 6fdab32e14e2bca05ae6471502bcdfd35b381564 (diff) | |
| parent | baf18fc261ca475343fe3cb9cd2c0dded4bc1bb7 (diff) | |
| download | git-0fd8cb3fec7abb36505a150fe5cfa9b1d8b85496.tar.gz | |
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
Diffstat (limited to 'fast-import.c')
0 files changed, 0 insertions, 0 deletions