Skip to content

Instantly share code, notes, and snippets.

@grayodesa
Forked from Agnostic/git-pull-yosemite-fix
Last active August 29, 2015 14:12
Show Gist options
  • Select an option

  • Save grayodesa/b31ea87ac37541c5ba66 to your computer and use it in GitHub Desktop.

Select an option

Save grayodesa/b31ea87ac37541c5ba66 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
. 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"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment