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” “$(if test -f “$BASE”; then echo “$BASE”; else echo “$LOCAL”; fi)” “$REMOTE”‘ git config –global mergetool.diffmerge.trustExitCode true Now git getdiff is available just as git diff # diff the local file.m against the checked-in version git difftool file.m # diff the local […]
Archives for June 2013
Sending with Gmail from 8890DW with Stunnel on Ubuntu
$ sudo apt-get install stunnel4 $ sudo cp /usr/share/doc/stunnel4/examples/stunnel.conf-sample /etc/stunnel/stunnel.conf $ vi /etc/default/stunnel4 Change: ENABLED=0 to ENABLED=1 $ vi /etc/stunnel/stunnel.conf # GLOBAL socket = l:TCP_NODELAY=1 socket = r:TCP_NODELAY=1 client=yes [SMTP Gmail] accept = 2525 connect = smtp.gmail.com:465 [POP3 Gmail Incoming] accept = 110 connect = pop.gmail.com:995 Create cert $ sudo openssl req -new -out mail.pem […]
Oh-My-Zsh Git Aliases
g git gst git status gd git diff gl git pull gup git pull –rebase gp git push gd git diff gc git commit -v gc! git commit -v –amend gca git commit -v -a gca! git commit -v -a –amend gco git checkout gcm git checkout master gr git remote grv git remote -v […]
Git Workflow – Lynda/Skoglund
KS git checkout master git pull git fetch git merge origin/master git checkout -b feedback_form git add feedback.html git commit -m “Add customer feedback form” git fetch git push -u origin feedback_form LDC git checkout master git pull git checkout -b feedback_form origin/feedback_form git log git show 84j34df8 git commit -am “Add something else to […]
iTerm2 + numpad fix
This shit was driving me batty. The numeric keypad is in application keypad mode. To fix it, go to preferences->profiles->keys->load preset… and choose “xterm with Numeric Keypad”
Remove all those pesky ._ files
I need to learn why it happens, but copying files from Mountain Lion to my Linux box results in an assload of “._” files. Removing them from the command line was getting frustrating. This helped; find . -iname ‘._*’ -delete
