OS X Brew – “Error: Failure while executing: git pull -q origin refs/heads/master:refs/remotes/origin/master”

In the middle of a `brew update`, I killed the process with ctrl+c.  This left the git repo in a broken state.

Please move or remove them before you can merge.
Error: Failure while executing: git pull -q origin refs/heads/master:refs/remotes/origin/master

To fix:

$ cd /usr/local
$ git add .
$ git stash
$ git reset --hard

`brew update` should now work.

OS X: Image Capture opens when you plug in your iPhone

Want to stop Image Capture from opening every time you plug your iPhone, iPod, or iPad in, and perhaps have iTunes open instead?  At some point in the recent past I must have accidentally set this option, but having not intentionally done so, I couldn’t recall how to set the default back to iTunes.

To disable Image Capture: With the device plugged in via USB, open Image Capture.  In the bottom left corner of the main application area, you should see the name if your iDevice and the text “Connecting this iPhone opens:” followed by a dropdown.  Click No Application.

To make iTunes open when you plug in your device: Open iTunes with your iPhone/iPad/iPod connected.  Select your device under Devices in the left column.  In the main window, scroll down to Options.  Check “Open iTunes when this iPhone is connected.