Re: How to avoid the ^M induced by Meld and Git

2012-12-14 Thread Karl Brand
FYI: It was all down to unexpected dos formatting of one of the files. Here's how i sorted out my unwanted ^M line endings in case anyone stumbles on this thread with the same issue i had. (reposted from

Re: How to avoid the ^M induced by Meld and Git

2012-12-12 Thread Michael J Gruber
Karl Brand venit, vidit, dixit 11.12.2012 13:33: Esteemed Git users, What i do: 1. Create a script.r using Emacs/ESS. 2. Make some modifications to script.r with the nice diff gui, Meld 3. Commit these modifications using git commit -am my message 4. Reopen script.r in Emacs/ESS to

Re: How to avoid the ^M induced by Meld and Git

2012-12-12 Thread Karl Brand
On 12/12/12 15:57, Michael J Gruber wrote: Karl Brand venit, vidit, dixit 11.12.2012 13:33: Esteemed Git users, What i do: 1. Create a script.r using Emacs/ESS. 2. Make some modifications to script.r with the nice diff gui, Meld 3. Commit these modifications using git commit -am my message

Re: How to avoid the ^M induced by Meld and Git

2012-12-12 Thread Michael J Gruber
Karl Brand venit, vidit, dixit 12.12.2012 16:34: On 12/12/12 15:57, Michael J Gruber wrote: Karl Brand venit, vidit, dixit 11.12.2012 13:33: Esteemed Git users, What i do: 1. Create a script.r using Emacs/ESS. 2. Make some modifications to script.r with the nice diff gui, Meld 3.

How to avoid the ^M induced by Meld and Git

2012-12-11 Thread Karl Brand
Esteemed Git users, What i do: 1. Create a script.r using Emacs/ESS. 2. Make some modifications to script.r with the nice diff gui, Meld 3. Commit these modifications using git commit -am my message 4. Reopen script.r in Emacs/ESS to continue working. The lines added (/edited ?) using Meld all