From c4b4c479a29df41d5318bcf02a83493030ca4c97 Mon Sep 17 00:00:00 2001 From: Dennis Evert Date: Tue, 14 Feb 2023 22:03:11 -0600 Subject: [PATCH] Use git-extras delete-squashed-branches instead of npm module and remove some no longer needed default nvm global installs --- git/.gitconfig | 11 ++++++----- node/nvm_default_packages | 5 +---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/git/.gitconfig b/git/.gitconfig index f4018a3..fe99ada 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -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 @@ -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 diff --git a/node/nvm_default_packages b/node/nvm_default_packages index 80115a0..13d8f7c 100644 --- a/node/nvm_default_packages +++ b/node/nvm_default_packages @@ -1,5 +1,2 @@ -eslint -git-delete-squashed -gulp-cli npm-check-updates -serve \ No newline at end of file +serve