Skip to content

Commit

Permalink
Use git-extras delete-squashed-branches instead of npm module and rem…
Browse files Browse the repository at this point in the history
…ove some no longer needed default nvm global installs
  • Loading branch information
devert committed Feb 15, 2023
1 parent 29f3d4e commit c4b4c47
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
11 changes: 6 additions & 5 deletions git/.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@

# branch
b = branch -v # branch (verbose)
br = branch -rv # branch (remote, verbose)
br = branch -rv # branch (remote, verbose)
bd = branch -d # branch delete
bdf = branch -D # branch force delete
# shortcut for git-extras delete-merged-branches (https://github.com/tj/git-extras/blob/master/Commands.md#git-delete-merged-branches)
# AND shortcut to delete squashed and merged branches (https://github.com/not-an-aardvark/git-delete-squashed)
dmb = "!f() { git-delete-squashed; git delete-merged-branches; }; f"

# Shortcut for git-extras delete-merged-branches (https://github.com/tj/git-extras/blob/master/Commands.md#git-delete-merged-branches)
# and delete-squashed-branches (https://github.com/tj/git-extras/blob/master/Commands.md#git-delete-squashed-branches)
dmb = "!f() { git delete-squashed-branches; git delete-merged-branches; }; f"

# commit
c = commit -m # commit with message
Expand Down Expand Up @@ -102,7 +103,7 @@
su = set-upstream
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
Expand Down
5 changes: 1 addition & 4 deletions node/nvm_default_packages
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
eslint
git-delete-squashed
gulp-cli
npm-check-updates
serve
serve

0 comments on commit c4b4c47

Please sign in to comment.