mirror of
https://github.com/kremalicious/dotfiles.git
synced 2024-11-21 17:27:13 +01:00
this & that
This commit is contained in:
parent
06696a943a
commit
5fccb47b55
1
brew
1
brew
@ -10,6 +10,7 @@ brew update
|
||||
brew upgrade
|
||||
|
||||
# Install what we need
|
||||
brew install bash
|
||||
brew install bash-completion
|
||||
brew install git
|
||||
brew install node
|
||||
|
24
gitconfig
24
gitconfig
@ -43,6 +43,12 @@
|
||||
# a.k.a. ‘delete merged’
|
||||
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
|
||||
|
||||
[fetch]
|
||||
prune = true
|
||||
|
||||
[push]
|
||||
default = matching
|
||||
|
||||
[color]
|
||||
diff = auto
|
||||
status = auto
|
||||
@ -63,19 +69,17 @@
|
||||
changed = yellow bold
|
||||
untracked = red
|
||||
|
||||
[push]
|
||||
default = matching
|
||||
|
||||
[difftool "Kaleidoscope"]
|
||||
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
||||
# Set Kaleidoscope as diff and merge tool
|
||||
[diff]
|
||||
tool = Kaleidoscope
|
||||
[difftool]
|
||||
prompt = false
|
||||
[mergetool "Kaleidoscope"]
|
||||
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
||||
trustExitCode = true
|
||||
[difftool "Kaleidoscope"]
|
||||
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
||||
[merge]
|
||||
tool = Kaleidoscope
|
||||
[mergetool]
|
||||
prompt = false
|
||||
[merge]
|
||||
tool = Kaleidoscope
|
||||
[mergetool "Kaleidoscope"]
|
||||
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
||||
trustExitCode = true
|
2
npmrc
2
npmrc
@ -3,4 +3,6 @@
|
||||
#registry = http://registry.npmjs.eu
|
||||
|
||||
# Make npm less noisy
|
||||
# If only it would work...
|
||||
# https://github.com/npm/npm/issues/4186
|
||||
loglevel = warn
|
Loading…
Reference in New Issue
Block a user