On Sun, Feb 23, 2014 at 6:57 AM, Thomas Rast wrote:
> Eric Sunshine writes:
>
>> On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast wrote:
>>> Using the new no_worktree flag from the previous commit, we can teach
>>> merge-recursive to leave the worktree untouched. Expose this with a
>>> new strategy
Eric Sunshine writes:
> On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast wrote:
>> Using the new no_worktree flag from the previous commit, we can teach
>> merge-recursive to leave the worktree untouched. Expose this with a
>> new strategy option so that scripts can use it.
>>
>> Signed-off-by: Jun
On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast wrote:
> Using the new no_worktree flag from the previous commit, we can teach
> merge-recursive to leave the worktree untouched. Expose this with a
> new strategy option so that scripts can use it.
>
> Signed-off-by: Junio C Hamano
> ---
> diff --git
From: Thomas Rast
Using the new no_worktree flag from the previous commit, we can teach
merge-recursive to leave the worktree untouched. Expose this with a
new strategy option so that scripts can use it.
Signed-off-by: Junio C Hamano
---
Documentation/merge-strategies.txt | 4
merge-rec
4 matches
Mail list logo
