fish: add open conflicting files with vscode function

matheusvellone · Jul 30, 2018 · 2dd3f60 · 2dd3f60
1 parent 5c723cf
commit 2dd3f60
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/fish/functions.fish b/fish/functions.fish
@@ -11,3 +11,7 @@ function git-delete-tag
     git tag -d $argv
     git push origin :refs/tags/$argv
 end
+
+function git-open-conflict
+    git status -s | grep 'UU\|AA' | awk '{print $2}' | xargs code
+end