Skip to content

Instantly share code, notes, and snippets.

@organisciak

organisciak/git_settings.sh

Created March 26, 2014 23:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save organisciak/9796372 to your computer and use it in GitHub Desktop.
Save organisciak/9796372 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git_settings.sh
# Setup Git global preferences
## Aliases
### Git up: a ff-only version of merge
### See: http://stackoverflow.com/questions/15316601/in-what-cases-could-git-pull-be-harmful
git config --global alias.up '!git remote update -p; git merge^ --ff-only @{u}'
### Git wiff
### "git diff --word-diff" >always used when writing
git config --global alias.wiff 'diff --word-diff'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment