This repository has been archived on 2024-03-28. You can view files and clone it, but cannot push or open issues or pull requests.
dotfiles/common/git/config

88 lines
1.8 KiB
Plaintext
Raw Normal View History

[user]
name = Daniel Flanagan
2020-04-07 11:12:33 -05:00
email = daniel@lyte.dev
2019-02-04 09:57:54 -06:00
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[core]
editor = nvim
excludesfile = /home/daniel/.home/.gitignore
[http "https://gopkg.in"]
followRedirects = true
[diff]
2020-02-12 11:13:46 -06:00
tool = nvimdiff
[difftool]
prompt = false
[alias]
a = add
2020-11-17 17:18:00 -06:00
A = add -A
ac = commit -a
b = rev-parse --symbolic-full-name HEAD
c = commit
cm = commit -m
cnv = commit --no-verify
2019-08-10 21:40:35 -05:00
co = checkout
d = diff
ds = diff --staged
dt = difftool
f = fetch
l = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate
graph = log --graph --abbrev-commit --decorate --oneline --all
ls = ls-files
2019-08-10 21:40:35 -05:00
mm = merge master
p = push
pf = push --force-with-lease
pl = pull
rim = rebase -i master
s = status
sur = submodule update --remote
[merge]
tool = nvimdiff
conflictstyle = diff3
[mergetool]
prompt = false
[mergetool "nvimdiff"]
2020-02-12 09:46:01 -06:00
cmd = nvimdiff $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd J'
2019-02-04 01:43:53 -06:00
[pager]
branch = false
2020-01-20 14:28:45 -06:00
# remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding
2020-11-06 09:31:50 -06:00
diff = nvim -c 'silent %sm/\\e[^mK]*[mK]//g' \
-c 'silent %s/^diff/\\r\\rdiff/' \
-c 'silent set ft=diff' \
-c 'silent execute \"normal gg2dd\"' \
-c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile'
2019-06-25 15:57:42 -05:00
2019-11-01 20:28:53 -05:00
[url "git@github.com:postmates"]
insteadOf = https://github.com/postmates
2020-01-20 14:28:45 -06:00
2020-01-08 10:59:45 -06:00
[commit]
gpgsign = true
2020-01-20 14:28:45 -06:00
2020-01-08 10:59:45 -06:00
[gpg]
program = gpg2
2020-02-13 16:29:47 -06:00
[include]
path = $ENV_PATH/gitconfig
2020-09-10 20:00:17 -05:00
[color]
ui = auto
2021-01-06 10:52:25 -06:00
# This next lines include Netlify's Git Credential Helper configuration in your Git configuration.
[include]
path = /home/daniel/.home/.netlify/helper/git-config
2021-01-15 10:18:48 -06:00
[init]
defaultBranch = master
[branch]
autoSetupMerge = always