#Handy GIT Commands
Configure diffmerge as git's default merge and diff tool:
git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd "diffmerge \"\$LOCAL\" \"\$REMOTE\""
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd "diffmerge --merge --result=\"\$MERGED\" \"\$LOCAL\" \"\$BASE\" \"\$REMOTE\""
git config --global mergetool.diffmerge.trustexitcode false
| # tar a dir and send to remote over ssh | |
| tar czf - dirname | ssh user@host '(cd /home && tar xzvf -) |
| $ ls -l | awk '{k=0;for(i=0;i<=8;i++)k+=((substr($1,i+2,1)~/[rwx]/)*2^(8-i));if(k)printf("%0o ",k);print}' |
| Rails CMS alternatives | |
| ====================== | |
| Active projects: | |
| --------------- | |
| adva-cms | |
| repo: http://github.com/svenfuchs/adva_cms/ | |
| site: http://adva-cms.org/ | |
| Last update: 11/24/09 | |
| "the cutting edge Rails CMS platform" |
| # Dit script leest de ISBN nummers uit isbn.csv uit en zoekt het ISBN-nummer vervolgens op op bol.com en selexyz.nl. | |
| # In theorie is er maximaal één resultaat. De productpaginalinks worden weggeschreven in aangevuld_isbn.csv | |
| require 'mechanize' | |
| require 'csv' | |
| # Browser agent maken. Agent alias is optioneel | |
| agent = Mechanize.new { |agent| | |
| agent.user_agent_alias = 'Mac Mozilla' | |
| } |