In addition to the above, if you are on a windows platform, you need to
set autocrlf to true in your git config:
https://help.github.com/articles/dealing-with-line-endings/#global-settings-for-line-endings
Jim
On 08/10/2014 11:51, Mungo Carstairs wrote:
Another suggestion:
Jalview Project Configuration:
If we add a file to the root of the Jalview project named
.gitattributes
containing this line:
* text=auto
then that should ensure that all commits of text files are normalised
to LF (not CRLF) line endings.
See
https://help.github.com/articles/dealing-with-line-endings/#per-repository-settings
NB I haven't actually committed or tried this yet because I am
cautious about the note at
https://help.github.com/articles/dealing-with-line-endings/#refreshing-a-repository-after-changing-line-endings
------------------------------------------------------------------------
*From:* [email protected]
<[email protected]> on behalf of David Roldán Martínez
<[email protected]>
*Sent:* 08 October 2014 10:52
*To:* Jalview Development List
*Subject:* Re: [Jalview-dev] Git diffs and newline characters
Good idea! I think this is important to make patching easier. Done in
my installation!
Thanks, Mungo.
2014-10-08 10:21 GMT+02:00 Mungo Carstairs <[email protected]
<mailto:[email protected]>>:
Would it be worth advising Eclipse users (e.g. us) to set this
General | Workspace preference:
[pastedImage.png]
instead of the default setting which may be Windows or Unix.
I'm assuming here that files in Git are generally Unix formatted.
I'll keep digging into Git configuration options to control the
diffs as well, but this seem to be a bit...problematic....
Mungo
The University of Dundee is a registered Scottish Charity, No:
SC015096
_______________________________________________
Jalview-dev mailing list
[email protected] <mailto:[email protected]>
http://www.compbio.dundee.ac.uk/mailman/listinfo/jalview-dev
The University of Dundee is a registered Scottish Charity, No: SC015096
_______________________________________________
Jalview-dev mailing list
[email protected]
http://www.compbio.dundee.ac.uk/mailman/listinfo/jalview-dev
_______________________________________________
Jalview-dev mailing list
[email protected]
http://www.compbio.dundee.ac.uk/mailman/listinfo/jalview-dev
