Skip to content

Instantly share code, notes, and snippets.

@m1ch3lp3r3z
Forked from Agnostic/git-pull-yosemite-fix
Last active August 29, 2015 14:08
Show Gist options
  • Save m1ch3lp3r3z/cc52cf156556e77f7bfe to your computer and use it in GitHub Desktop.
Save m1ch3lp3r3z/cc52cf156556e77f7bfe to your computer and use it in GitHub Desktop.
// Open:
/Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-pull
// Replace line 11 & 12 & 207
. git-sh-setup
. git-sh-i18n
. git-parse-remote
// 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
. /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-parse-remote
// 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"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment