Re: [PATCH 10/18] revert: Save data for continuing after conflict resolution

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi again,

Jonathan Nieder writes:
> Ramkumar Ramachandra wrote:
>> That these two files alone are not enough to implement a "--continue"
>> that remembers the command-line options specified; later patches in
>> the series save them too.
>
> Micronit: I think this sentence has an extra "That".

Ugh.  Fixed.

>> +pristine_detach () {
>> +     git checkout -f "$1^0" &&
>> +     git read-tree -u --reset HEAD &&
>> +     git clean -d -f -f -q -x
>> +}
>
> Nit: probably best to include the "rm -rf .git/sequencer" in this
> function.  But I don't think that should hold up the patch.

Ah, good idea.  Fixed.

Thanks.

-- Ram
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]