wsajason
10/20/2014 - 2:00 PM

git-pull-yosemite-fix

// Open:
/Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-pull

// Replace line 11 & 12
. git-sh-setup
. git-sh-i18n

// With this:
. /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-sh-setup
. /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-sh-i18n

// Find:
eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"

// And do the same:
eval="/Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"