Add git-fix and git-fixed

Quick helpers for opening conflicted files in vim and then adding them once resolved.
aron · Feb 2, 2016 · ac5bf37 · ac5bf37
1 parent 2b5e30c
commit ac5bf37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.bin/git-fix b/.bin/git-fix
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd "$(git rev-parse --show-toplevel)"
+vim -p "$(git diff --name-only --diff-filter=U)"
diff --git a/.bin/git-fixed b/.bin/git-fixed
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd "$(git rev-parse --show-toplevel)"
+git add "$(git diff --name-only --diff-filter=U)"