On Tue, Jun 5, 2018 at 12:14 AM, Elijah Newren wrote:
> On Sun, Jun 3, 2018 at 8:19 PM, Junio C Hamano wrote:
>> Elijah Newren 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
On Sun, Jun 3, 2018 at 8:19 PM, Junio C Hamano wrote:
> Elijah Newren 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.
>>
>> We modify
Elijah Newren 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.
>
> We modify index_has_changes() to take an extra argument specifying the
>
On 04/06/18 00:37, brian m. carlson wrote:
> On Sun, Jun 03, 2018 at 02:52:12PM +0100, Ramsay Jones wrote:
>> On 03/06/18 07:58, Elijah Newren wrote:
>>> I'm really unsure where the index_has_changes() declaration should go;
>>> I stuck it in tree.h, but is there a better spot?
>>
>> Err, leave
On Sun, Jun 03, 2018 at 02:52:12PM +0100, Ramsay Jones wrote:
> On 03/06/18 07:58, Elijah Newren wrote:
> > I'm really unsure where the index_has_changes() declaration should go;
> > I stuck it in tree.h, but is there a better spot?
>
> Err, leave it where it is and '#include "tree.h"' ? :-D
Or
On 03/06/18 07:58, Elijah Newren wrote:
> `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.
>
> We modify index_has_changes() to take an extra
`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.
We modify index_has_changes() to take an extra argument specifying the
tree to compare the index to. If
7 matches
Mail list logo