Skip to content

Instantly share code, notes, and snippets.

@brh55

brh55/GitResources.md

Last active May 12, 2016 14:22
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 brh55/83a8d7d7a3c93e1671b71ef4098a1579 to your computer and use it in GitHub Desktop.
Save brh55/83a8d7d7a3c93e1671b71ef4098a1579 to your computer and use it in GitHub Desktop.
Download ZIP
Useful Easy to Digest Git-related Resources
Raw
GitResources.md

Merging

Explains a Fast-Forward When Git Pull Hurts

Useful Alias

git up

git config --global alias.up '!git remote update -p; git merge --ff-only @{u}

Prunes remote branches and updates them, then fast-forward local branch from the Upstream branch. However, fails if there are local changes to prevent a merge conflict and undesired fast-forwarding.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment