[I know it was you Fredo. You Broke My Heart][1]
-- [The Godfather Part II][2]
[Show Me The Money][3]
-- [Jerry Maguire][4]
[I know it was you Fredo. You Broke My Heart][1]
-- [The Godfather Part II][2]
[Show Me The Money][3]
-- [Jerry Maguire][4]
FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
##Software
#!/bin/bash | |
doneFile=~/Dropbox/Apps/Drafts/Journal.txt | |
if [[ -s $doneFile ]] ; then | |
echo -e "\n\n #done" >> $doneFile | |
/usr/local/bin/dayone new < $doneFile | |
rm $doneFile | |
touch $doneFile | |
fi ; |
#triangle-down { | |
width: 0; | |
height: 0; | |
border-left: 50px solid transparent; | |
border-right: 50px solid transparent; | |
border-top: 100px solid red; | |
} |
⌘T | go to file |
⌘⌃P | go to project |
⌘R | go to methods |
⌃G | go to line |
⌘KB | toggle side bar |
⌘⇧P | command prompt |
Some books I'd recommend:
Philip Roth has stopped writing novels. Having read all of the novels he's written I'm sad that I'll never read another one for the first time so the next best thing is reading them again. I invite you all to join me in reading a selection of these novels throughout 2013: The Year of Roth.
In order to keep the reading list manageable I've culled the complete bibliography, cutting off both ends (including all the late short books) and removing a few others. As much as some folks love The Great American Novel it's unquestionably minor Roth and I could do without reading it again. I've omitted The Plot Against America because it's long and a downer to have to end on. Feel free to pick it up on 1/1/2014.
Following is a list of included books with start dates:
My Life as a Man Feb 4Portnoy's Complaint | Jan 1 |
The Breast | Jan 28 |
[<>=]{5} |
#!/bin/bash | |
refname="$1" | |
oldrev="$2" | |
newrev="$3" | |
result=0 | |
# Make sure we handle the situation when the branch does not exist yet | |
if ! [ $oldrev = 0000000000000000000000000000000000000000 ] ; then | |
excludes=( ^$oldrev ) |