![]() ![]() When * (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison if there is no file that matches other criteria, nothing is selected. Any combination of the filter characters (including none) can be used. regular file, symlink, submodule, …) changed (T), are Unmerged (U), are Unknown (X), or have had their pairing Broken (B). Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their type (i.e. However, what you can do though is leverage the -diff-filter option which assigns a states to files. When you are in the middle of rebasing, this is probably not going to happen often though I would say in most cases answer works. Piping it into uniq is a good solution for this but git diff -name-only will also include files you might have purposely changed so it doesn't actually filter only files with merge conflicts. This is why sometimes it will yield duplicate entries because it marks the file as "modified" as well as in a merge conflict state. git diff -name-only will give you all files that have diffs.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |