Skip to content

Instantly share code, notes, and snippets.

@mightydes

mightydes/.gitignore refresh

Last active August 29, 2015 13:57
Show Gist options
  • Save mightydes/9369623 to your computer and use it in GitHub Desktop.
Save mightydes/9369623 to your computer and use it in GitHub Desktop.
Download ZIP
Git
Raw
.gitignore refresh
git rm -r --cached /
Raw
Commit to branch
git stash
git checkout -b other-branch
git stash pop
Raw
Conflicts
git diff --name-only --diff-filter=U
Raw
Merge strategy
git checkout --ours -- <paths>
# or
git checkout --theirs -- <paths>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment