[user] name = littleblack111 email = littleblack11111@gmail.com [init] defaultBranch = main [push] autoSetupRemote = true default = current [commit] gpgsign = true [alias] permission-reset = !git diff -p -R --no-ext-diff --no-color --diff-filter=M | grep -E \"^(diff|(old|new) mode)\" --color=never | git apply [credential "https://github.com"] helper = helper = !/usr/bin/gh auth git-credential [credential "https://gist.github.com"] helper = helper = !/usr/bin/gh auth git-credential [safe] directory = /var/db/repos/ebuilds [pull] rebase = true [filter "lfs"] smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true clean = git-lfs clean -- %f [tag] gpgSign = true [rebase] autosquash = true updateRefs = true [core] sshCommand = ssh -p 2002 [merge] ff = false conflictStyle = "diff3" [lfs] cachecredentials = true [merge "mergiraf"] name = mergiraf driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L [diff] # Set difftastic as the default difftool, so we don't need to specify # `-t difftastic` every time. tool = difftastic external = difft --color=auto# --display=inline [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`. diff = delta log = delta reflog = delta show = delta difftool = true [interactive] diffFilter = delta --color-only [delta] navigate = true side-by-side = true line-numbers = true