Skip to content

Instantly share code, notes, and snippets.

@YemSalat
Created December 5, 2014 03: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 YemSalat/443282f411d791c86ac2 to your computer and use it in GitHub Desktop.
Save YemSalat/443282f411d791c86ac2 to your computer and use it in GitHub Desktop.
useful git commands

git diff --name-only --diff-filter=U - list all conflict files (filenames only)

git rm --cached filename.txt - remove file from cache (useful if file is added to gitignore after it was already commited)

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