Elijah Newren <[email protected]> writes: > `git merge-recursive` does a three-way merge between user-specified trees > base, head, and remote. Since the user is allowed to specify head, we can > not necesarily assume that head == HEAD.
Makes sense.
- [PATCH v2 1/9] read-cache.c: move index_has_changes() from ... Elijah Newren
- [PATCH v2 2/9] index_has_changes(): avoid assuming operatin... Elijah Newren
- Re: [PATCH v2 2/9] index_has_changes(): avoid assuming... Junio C Hamano
- [PATCH v2 4/9] t6044: add a testcase for index matching hea... Elijah Newren
- [PATCH v2 9/9] merge: fix misleading pre-merge check docume... Elijah Newren
- [PATCH v2 8/9] merge-recursive: enforce rule that index mat... Elijah Newren
- Re: [PATCH v2 8/9] merge-recursive: enforce rule that ... Junio C Hamano
- [PATCH v2 5/9] merge-recursive: make sure when we say we ab... Elijah Newren
- [PATCH v2 7/9] t6044: add more testcases with staged change... Elijah Newren
- [PATCH v2 6/9] merge-recursive: fix assumption that head tr... Elijah Newren
- Re: [PATCH v2 6/9] merge-recursive: fix assumption tha... Junio C Hamano
