Skip to content

Instantly share code, notes, and snippets.

What would you like to do?
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
You can’t perform that action at this time.