Hello,
On Thu, Nov 27, 2014 at 5:14 AM, Johan Herland wrote:
> FWIW, I would very much like a "2nd-level split" where it simply splits
> into individual lines. I think it's not worth trying to be extra clever
> about it. For your example, I'd simply want the following behavior:
>
> -AAA
> -BB
On Thu, Nov 27, 2014 at 9:55 AM, Ulrich Windl
wrote:
> I probably forgot to mention the obvious: My enhancement request was
> for cases where git would reject so split a hunk. I don't want to
> change the default split (if it finds a point to split).
> So maybe call it a "2nd-level-split". Only if
I probably forgot to mention the obvious: My enhancement request was for cases
where git would reject so split a junk. I don't want to change the default
split (if it finds a point to split).
So maybe call it a "2nd-level-split". Only if split refuses to split, you could
avoid using "edit" to ma
Junio C Hamano writes:
> "Ulrich Windl" writes:
>
>> Another split that is not possible is a split across an empty line, like:
>>
>> +AAA
>> +
>> +BBB
>
> Likewise. An empty line is not that special. AAA may be adding one
> block of lines "if (condition) { ... }" and BBB may be another, a
"Ulrich Windl" writes:
> This is for git-1.7.12 (an older version from the SLES11 SP3 SDK). If
> the issue is solved meanwhile, I'll be happy, and I apologize for
> being too lazy to find out.
The answer is no ;-).
> Currently Git cannot split a block of changes like
>
> -AAA
> -BBB
> +CCC
> +D
5 matches
Mail list logo
