On Tue, Apr 24, 2018 at 1:31 PM, Ben Peart wrote:
> On 4/24/2018 2:59 PM, Elijah Newren wrote:
>> On Tue, Apr 24, 2018 at 10:11 AM, Ben Peart
>> wrote:
>>>
>>> diff --git a/builtin/merge.c b/builtin/merge.c
>>> index 8746c5e3e8..3be52cd316 100644
>>> --- a/builtin/merge.c
>>> +++ b/builtin/merge.
On 4/24/2018 2:59 PM, Elijah Newren wrote:
Sorry, I noticed something else I missed on my last reading...
On Tue, Apr 24, 2018 at 10:11 AM, Ben Peart wrote:
diff --git a/builtin/merge.c b/builtin/merge.c
index 8746c5e3e8..3be52cd316 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -424,
Sorry, I noticed something else I missed on my last reading...
On Tue, Apr 24, 2018 at 10:11 AM, Ben Peart wrote:
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 8746c5e3e8..3be52cd316 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -424,6 +424,7 @@ static void finish(struct
On Tue, Apr 24, 2018 at 10:11 AM, Ben Peart wrote:
> Add the ability to control rename detection for merge via a config setting.
Sweet, thanks for including the documentation updates.
I lean towards the side of the argument that says that since
merge.renameLimit inherits from diff.renameLimit, m
Add the ability to control rename detection for merge via a config setting.
Reviewed-by: Johannes Schindelin
Signed-off-by: Ben Peart
---
Documentation/diff-config.txt | 3 ++-
Documentation/merge-config.txt | 8 +++-
Documentation/merge-strategies.txt | 6 --
builtin/merge.c
5 matches
Mail list logo