repositories / dotfiles
dotfiles
bugabingas dorkfiles
owned by bugabinga
git/gitconfig
Raw[alias]
m = mergetool
rc = rebase --continue
ra = rebase --abort
ci = commit --all
st = status --short
# interactive add
ap = add --patch
a = add --all
l = log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an %ar%C(auto) %D%n%s%n'
[core]
editor = nvim
quotepath = false
autocrlf = false
safecrlf = false
symlinks = true
fscache = true
preloadindex = true
fsmonitor = true
attributesfile = .gitattributes
untrackedcache = true
compression = 9
whitespace = error
[log]
abbrevCommit = true
graphColors = blue,yellow,cyan,magenta,green,red
[color "decorate"]
HEAD = red
branch = blue
tag = yellow
remoteBranch = magenta
[color "branch"]
current = magenta
local = default
remote = yellow
upstream = green
plain = blue
[advice]
addEmptyPathSpec = false
pushNonFastForward = false
statusHints = false
[url "git@github.com:bugabinga/"]
insteadOf = "bugabinga:"
[url "git@github.com:isp-insoft/"]
insteadOf = "isp:"
[url "git@github.com:"]
insteadOf = "github:"
[status]
branch = true
showStash = true
showUntrackedFiles = all
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[help]
format = html
# try to automatically correct mispelled git commands
autocorrect = 1
[color]
interactive = true
ui = auto
[rebase]
autoStash = true
updateRefs = true
missingCommitsCheck = warn
[rerere]
enabled = true
autoupdate = true
[diff]
context = 3
renames = copies
interHunkContext = 10
colorMoved = default
tool = difftastic
[difftool]
prompt = false
[difftool "meld"]
cmd = "meld \"$LOCAL\" \"$REMOTE\""
[difftool "difftastic"]
cmd = "difft \"$LOCAL\" \"$REMOTE\""
[pager]
difftool = true
[merge]
tool = vim
conflictstyle = zdiff3
[mergetool]
keepBackup = false
prompt = false
[merge "mergiraf"]
name = mergiraf
driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L
[mergetool "vim"]
cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
[branch]
sort = -committerdate
[tag]
sort = version:refname
[fetch]
prune = true
pruneTags = true
all = true
[push]
autoSetupRemote = true
default = current
followTags = true
[pull]
default = current
rebase = true
[interactive]
diffFilter = delta --color-only
singlekey = true
[delta]
side-by-side = true
line-numbers = true
decorations = true
navigate = true
syntax-theme = none
[interactive]
diffFilter = delta --color-only
[init]
defaultBranch = trunk
[commit]
verbose = true
[difftool "difftastic"]
# See `man git-difftool` for a description of MERGED, LOCAL and REMOTE.
cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644"
[difftool]
# Run the difftool immediately, don't ask 'are you sure' each time.
prompt = false
[pager]
# Use a pager if the difftool output is larger than one screenful,
# consistent with the behaviour of `git diff`.
difftool = true
[diff]
# Set difftastic as the default difftool, so we don't need to specify
# `-t difftastic` every time.
tool = difftastic
algorithm = histogram
colorMoved = plain
mnemonicPrefix = true
renames = true
# In order to have host-specific configuration, I include additional settings here.
# On each host a different file might be symlinked into '.gitconfig.include'.
[include]
path = .gitconfig.include