Skip to content

Commit

Permalink
Global gitignore + deprecate Meld
Browse files Browse the repository at this point in the history
I was using Meld for diffing/merging but it's not reliable on Mac. I'm
merging straight in the editor now, as it's less faff.
  • Loading branch information
ivantoniev committed Aug 22, 2022
1 parent 965ba00 commit 4fc08ad
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
35 changes: 19 additions & 16 deletions gitconfig
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
[core]
editor = vim
pager = delta --dark --plus-color="#012800" --minus-color="#340001" #--theme="base16"
editor = nvim
pager = delta --dark --plus-style="#012800" --minus-style="#340001"
excludesfile = /Users/ivanivanov/.gitignore_global
[pager]
log = delta
show = delta
diff = delta
[delta]
features = decorations
syntax-theme = Monokai Extended
navigate = true
[interactive]
diffFilter = delta --color-only
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
[merge]
tool = meld
[mergetool]
prompt = false
[mergetool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
[alias]
co = checkout
br = branch
Expand All @@ -24,12 +27,12 @@
[fetch]
prune = true
[user]
name = Ivan Ivanov
email = [email protected]
signingkey = key
name = Ivan Ivanov
[commit]
gpgsign = true
gpgsign = true
[gpg]
program = /usr/local/bin/gpg
program = /usr/local/bin/gpg
[push]
followTags = true
followTags = true
[gpg]
program = gpg
1 change: 1 addition & 0 deletions gitignore_global
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sesh.vim

0 comments on commit 4fc08ad

Please sign in to comment.