Skip to content

Commit

Permalink
Update git fix command
Browse files Browse the repository at this point in the history
  • Loading branch information
Aron Carroll authored and aron committed Feb 2, 2016
1 parent ac5bf37 commit a60cd60
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .bin/git-fix
@@ -1,4 +1,4 @@
#!/bin/sh

cd "$(git rev-parse --show-toplevel)"
vim -p "$(git diff --name-only --diff-filter=U)"
cd $(git rev-parse --show-toplevel)
vim -p $(git diff --name-only --diff-filter=U)
6 changes: 4 additions & 2 deletions .bin/git-fixed
@@ -1,4 +1,6 @@
#!/bin/sh

cd "$(git rev-parse --show-toplevel)"
git add "$(git diff --name-only --diff-filter=U)"
cd $(git rev-parse --show-toplevel)
FIXED_FILES=$(git diff --name-only --diff-filter=U)
echo $FIXED_FILES | xargs git add
echo "Staged the following fixed files...\n$FIXED_FILES"

0 comments on commit a60cd60

Please sign in to comment.