Skip to content

Instantly share code, notes, and snippets.

@anandjagadeesh

anandjagadeesh/Diffs or files with conflicts.md

Created July 2, 2020 19:49
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 anandjagadeesh/4bd8b8dddf6a9ba5136ad0f2d5fbd376 to your computer and use it in GitHub Desktop.
Save anandjagadeesh/4bd8b8dddf6a9ba5136ad0f2d5fbd376 to your computer and use it in GitHub Desktop.
Download ZIP
Showing diffs or files with conflicts during a merge or pull
Raw
Diffs or files with conflicts.md

You can view diffs or just filenames of files with conflicts during a pull or merge

To view diffs of files with conflicts, give:

git diff --diff-filter=U

Or if you have difftool set, for example yadt or vimdiff

git difftool --diff-filter=U

And if you want to see only the filenames, give

git diff --name-only --diff-filter=U
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment