this situation could happen in
DOS batch files or PowerShell scripts with CRLF EOL.
2015-04-21 21:28 GMT+02:00 Torsten Bögershausen :
> On 2015-04-21 15.51, Alexandre Garnier wrote:
>> Here is a test:
>>
>> git init -q crlf-test
>> cd crlf-test
>> echo '*
Here is a test:
git init -q crlf-test
cd crlf-test
echo '* text=auto' > .gitattributes
git add .gitattributes
git commit -q -m "Normalize EOL"
echo -ne 'some content\r\nother \rcontent with CR\r\ncontent\r\nagain
content with\r\r\n' > inline-cr.txt
echo "Working directory content:"
cat -A in
2014-11-04 17:21 GMT+01:00 Phil Hord :
> On Fri, Oct 31, 2014 at 4:40 AM, Alexandre Garnier
> wrote:
>> When merging 2 branches with the same modifications on the both sides,
>> depending the merge side, one branch disappear from the file history.
>>
>> To be mo
When merging 2 branches with the same modifications on the both sides,
depending the merge side, one branch disappear from the file history.
To be more clear, there is a script in attachment to reproduce, but
here is the result :
$ git log --graph --oneline --all --decorate --name-status
* 63c80
4 matches
Mail list logo
