May 16, 2016
Loading...
seen from Taiwan
seen from Belarus
seen from Germany
seen from Finland
seen from Malaysia
seen from Taiwan
seen from Taiwan
seen from United Kingdom
seen from United Kingdom
seen from Germany
seen from Australia
seen from China
seen from Canada
seen from China
seen from Germany
seen from Netherlands
seen from Malaysia
seen from Belgium
seen from Kuwait
seen from New Zealand
Anya is live and ready to show you everything. Watch her strip, dance, and perform exclusive shows just for you. Interact in real-time and make your fantasies come true.
Free to watch • No registration required • HD streaming
Git, Windows, Unix et les problèmes de EOL (End Of Line)
Récemment, nous avions à créer un environnement de développement pour un projet web. Le client développe sous Windows. Préférant Unix dans l'équipe, nous avons commencé à travailler sur nos machines. Rapidement, nous avons eu un squelette d'application fonctionnelle dont les sources étaient versionnées sous Git.
Setting git attributes
Just like with the gitignore file, attributes can be set at the user level (by default in the file ~/.config/git/attributes), or in the repository at the directory level using a .gitattributes file.
For a LaTeX project, you probably want to set at least these:
*.pdf binary .gitignore export-ignore .gitattributes export-ignore *.tex diff=tex
The last line should define both what a word looks like in a TeX file (useful if you are setting git diff to compare words instead of lines), and should also include the section or subsection commands with the line numbers for each chunk.
Managing Distributables on Github
Typically when (browser based) distributables are include in a Github project they're added to the gh-pages branch. This is done to avoid having duplicate changes in the commit logs for the source and distributable. For example, changing a variable name in source, rebuilding, and then committing, would result in a commit containing a diff to the source AND each built distributable file.
However, there are use cases for having the distributable on your master branch, and I've developed a solution (of sorts) to make it work in a fairly clean manner.
For Blanket.js, I like to provide 4 distributable files, a QUnit and Jasmine build, and a minified version of each. Adding these 4 files to a gh-pages branch is too much overhead. I rebuild the project after each change to run my tests anyway, so I'd rather just have the new distributables live in master and be available after each commit to master.
Enter, .gitattributes. Creating a .gitattributes file allows you to change the git attributes of given files. According to the documentation you can tell git to handle your file as binary, so diffs won't be created:
`dist/*.js -diff`
In practice, this didn't work for me on GitHub (maybe it ignores the git attribute on files that have already been tracked?). I have to change the merge attribute to union (which may not always give the intended result), but it works for me (I also run the distributables through tests on the CI):
`dist/*.js merge=union`
You can see a Pull Request without and with the git attributes in place (I'm aware that I'm probably getting the right result for the wrong reasons, but the approach should work in theory if done correctly).