Skip to content

Commit

Permalink
- SublimeText: exclude more folders
Browse files Browse the repository at this point in the history
- bin: add git-branches-cleanup
- bin: git-undo => I usually use --mixed
  • Loading branch information
markets committed Apr 12, 2017
1 parent dee4c22 commit 482515a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
10 changes: 10 additions & 0 deletions bin/git-branches-cleanup
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

# Clean up branches

echo "Pruning remote branches..."
git remote prune origin
echo ""

echo "Removing local merged branches..."
git branch --merged | grep -v "\*\|master\|develop" | xargs -n 1 git branch -d
4 changes: 2 additions & 2 deletions bin/git-undo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash

# Undo your last commit
# Undo your last commit by reseting the index but not the working tree

git reset --soft HEAD^
git reset --mixed HEAD^
5 changes: 4 additions & 1 deletion sublime-text/Preferences.sublime-settings
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
[
".git",
".bundle",
"coverage"
"coverage",
"public/assets",
"tmp",
"log"
],
"font_face": "Monaco",
"font_size": 12,
Expand Down

0 comments on commit 482515a

Please sign in to comment.