Skip to content

Instantly share code, notes, and snippets.

@nyeholt

nyeholt/.gitconfig

Created January 7, 2016 22:23
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 nyeholt/cb8bffd1ed2f0650c6d4 to your computer and use it in GitHub Desktop.
Save nyeholt/cb8bffd1ed2f0650c6d4 to your computer and use it in GitHub Desktop.
Download ZIP
Git aliases
Raw
.gitconfig
[alias]
update-from = "!f() { git fetch $1 --prune; git merge --ff-only $1/$2 || git rebase --preserve-merges $1/$2; }; f"
ff = merge --ff-only
nf = merge --no-ff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment