sjs/bin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support spaces in filenames in git-conflicts

Browse source
This commit is contained in:
Sami Samhuri 2015-04-01 11:06:51 -07:00
parent bc71acffde
commit 5496b7f740
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-conflicts
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
# Usage: git-conflicts # Usage: git-conflicts
# Show list of files in a conflict state. # Show list of files in a conflict state.
git ls-files -u | awk '{print $4}' | sort -u git ls-files -u | cut -f2- | sort -u