On Sun, 27 Sep 2015 23:47:23 -0700
Michael wrote:
> So how do you deal with patches that are mostly wrecked by spacing
> changes?
Try `git merge -s recursive -X ignore-space-change `?
Please search the git-merge manual page for the "white" keyword.
[...]
--
You received this message because
ahh ... thanks a lot
On Mon, Sep 28, 2015 at 1:59 AM, Gergely Polonkai
wrote:
> Hello,
>
> you will need to reset the branch: git reset SHA
>
> Best,
> Gergely
> On 28 Sep 2015 05:27, "Raghu K" wrote:
>
>> Using some online code I have created a python tool that outputs fancy
>> status for any
