On 08/03/15 11:06, Junio C Hamano wrote:
> Anton Trunov writes:
>
>> On 04/03/15 23:01, Junio C Hamano wrote:
>>
>> My apologies for pushing this topic, but what would you recommend?
>> Should we treat both sides line-wise or should we correct the documentation?
>
> My gut feeling is that the ch
Anton Trunov writes:
> On 04/03/15 23:01, Junio C Hamano wrote:
>
> My apologies for pushing this topic, but what would you recommend?
> Should we treat both sides line-wise or should we correct the documentation?
My gut feeling is that the change to swap which side is examined
first would end u
On 04/03/15 23:01, Junio C Hamano wrote:
> []
My apologies for pushing this topic, but what would you recommend?
Should we treat both sides line-wise or should we correct the documentation?
Current version for git help merge:
...
ignore-space-change, ignore-all-space, ignore-space-at-eol
Tr
On 04/03/15 23:01, Junio C Hamano wrote:
> Anton Trunov writes:
>
>> For the code version before applying this patch the following scenario
>> will take place if "git merge -Xignore-all-space remote" gets executed.
>>
>> base file:
>> 1st line
>> 2nd line
>>
>> master file:
>> 1st line
>> 2nd
Anton Trunov writes:
> For the code version before applying this patch the following scenario
> will take place if "git merge -Xignore-all-space remote" gets executed.
>
> base file:
> 1st line
> 2nd line
>
> master file:
> 1st line
> 2nd line with substantial change
>
> remote file:
>
On Wed, Mar 4, 2015 at 4:55 AM, Anton Trunov wrote:
> On 04/03/15 10:07, Eric Sunshine wrote:
+ echo " \t\ttwo words " >text.txt &&
>>
>> Use of echo "\t" is not portable. Either embed literal tab characters
>> or use printf "\t".
> OK.
> Shouldn't it be printf "\t\n" for exact subst
On 03/03/15 23:17, Torsten Bögershausen wrote:
> On 2015-03-03 18.37, Anton Trunov wrote:
> []
>> Signed-off-by: Anton Trunov gmail.com>
> Should we use the "real email" here (with the '@') ?
Didn't realize the parser for the web version mangles emails.
Will use the "real email".
>> ---
>> t/t3
On 04/03/15 10:07, Eric Sunshine wrote:
> On Tue, Mar 3, 2015 at 3:17 PM, Torsten Bögershausen wrote:
>> On 2015-03-03 18.37, Anton Trunov wrote:
>> []
>>> Signed-off-by: Anton Trunov gmail.com>
>> Should we use the "real email" here (with the '@') ?
>>> ---
>>> diff --git a/t/t3032-merge-recursi
On 03/03/15 23:32, Junio C Hamano wrote:
> Anton Trunov writes:
>
>> The git-merge manual says that the ignore-space-change,
>> ignore-all-space, ignore-space-at-eol options preserve our version
>> if their version only introduces whitespace changes to a line.
>>
>> So far if there is whitespace-
On Tue, Mar 3, 2015 at 3:17 PM, Torsten Bögershausen wrote:
> On 2015-03-03 18.37, Anton Trunov wrote:
> []
>> Signed-off-by: Anton Trunov gmail.com>
> Should we use the "real email" here (with the '@') ?
>> ---
>> diff --git a/t/t3032-merge-recursive-options.sh
>> b/t/t3032-merge-recursive-opti
Anton Trunov writes:
> The git-merge manual says that the ignore-space-change,
> ignore-all-space, ignore-space-at-eol options preserve our version
> if their version only introduces whitespace changes to a line.
>
> So far if there is whitespace-only changes to both sides
> in *all* lines their
On 2015-03-03 18.37, Anton Trunov wrote:
[]
> Signed-off-by: Anton Trunov gmail.com>
Should we use the "real email" here (with the '@') ?
> ---
> t/t3032-merge-recursive-options.sh | 43
> ++
> xdiff/xmerge.c | 10 -
> 2 files chang
The git-merge manual says that the ignore-space-change,
ignore-all-space, ignore-space-at-eol options preserve our version
if their version only introduces whitespace changes to a line.
So far if there is whitespace-only changes to both sides
in *all* lines their version will be used.
This commit
13 matches
Mail list logo
