dpwright

#!/usr/bin/env ruby

require 'rubygems'
require 'tlsmail'

msg=<<EOF
From: Test Sender <[email protected]>
To: Test Recipient <[email protected]>
Subject: test

dpwright

grep -Rl "SEARCH" . | while read FILE; do sed -i "" "/LINE/d" $FILE; done
grep -Rl "SEARCH" . | while read FILE; do sed "/LINE/d" $FILE > tmp; mv tmp $FILE ; done

dpwright

grep -Rl "SEARCH" . | while read FILE; do (echo "g/LINE/d"; echo 'wq') | ex -s FILE; done

dpwright

# I want to keep MY version when there is a conflict
# Nothing to do: %A (the second parameter) already contains my version
# Just indicate the merge has been successfully "resolved" with the exit status
exit 0

dpwright

# I want to keep THEIR version when there is a conflict
# Copy their version over ours and report success
cp -f $3 $2
exit 0

dpwright

*.exe -crlf -diff merge=keep-mine
*.tga -crlf -diff merge=keep-mine

dpwright

#!/usr/bin/env bash

LOOK=/usr/bin/svnlook
REPOS="$1"
REV="$2"
PROJECT="$3"

AUTHOR=$($LOOK author $REPOS -r $REV)

DOMAIN=domain.com

dpwright

dt = "!f() { vim -p $(git diff --name-only) +\"tabdo Gdiff $@\" +tabfirst; }; f"

dpwright

while true; do echo -e -n "\r`ls -l -h FILENAME | awk '{ print $5 }'`"; done

dpwright

amend-commit = "!f() { START=`(git symbolic-ref -q HEAD || git rev-parse HEAD) | cut -d"/" -f 3`; git checkout -q $1 && git commit --amend && git rebase --onto HEAD $1 $START; }; f"