# better? defaults [help] autocorrect = prompt [init] defaultBranch = main [column] ui = auto [branch] sort = -committerdate [tag] sort = version:refname [status] branch = true short = true showStash = true showUntrackedFiles = all submoduleSummary = true [log] date = iso [fetch] prune = true pruneTags = true [push] autoSetupRemote = true followTags = true recurseSubmodules = on-demand [pull] rebase = true [rerere] enabled = true autoupdate = true [gc] reflogExpire = 200 reflogExpireUnreachable = 90 [commit] verbose = true gpgsign = true template = ~/.config/git/template [rebase] autoSquash = true autoStash = true updateRefs = true # my setup [core] editor = vim pager = delta whitespace = -trailing-space,-space-before-tab compression = 9 # trade cpu for network [alias] # * replaced by git-extras # * (alias) aliases = !git config -l | grep ^alias | cut -c 7- | sort # List all aliases. Stolen from here: https://twitter.com/TrevorBramble/status/774292970681937920 branch-default = !git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@' # * branches (↓) = for-each-ref --sort=-committerdate refs --format=\"%(authordate:iso8601)\t%(color:blue)%(refname:short)%(HEAD)\t%(if:notequals="")%(upstream:short)%(then)→ %(upstream:short)%(color:reset)%(else)%(color:yellow)%(objectname:short)%(color:reset)\t%(contents:subject)%(end)\" h-branches = !echo 'brv (git-extras)' tags = tag -l --sort=-creatordate --format='%(refname:short): [%(creatordate:short)] %(subject)' # * authors: log-authors = shortlog -ns h-format-htma = !echo '%Cred%h%Creset %Cgreen[%ad] -%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' commit--interactive= !clear && git status && git commit --interactive h-unstage = !echo reset HEAD -- h-undoall = !echo reset --soft HEAD^ diff-dirs = diff --dirstat --find-copies --find-renames --histogram --color h-submodule-delete = !echo 'delete-submodule (git-extras)' # * delete-submodule: rm-submodule = !git submodule deinit -f $1 && rm -rf .git/modules/$1 && git rm -rf $1 submodule-update-merge = submodule update --remote --merge set-upstream-to-current = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD` [diff] wsErrorHighlight = all tool = vimdiff submodule = log algorithm = histogram # https://git-scm.com/docs/git-diff#Documentation/git-diff.txt-code--color-movedltmodegtcode colorMoved = dimmed-zebra mnemonicPrefix = true renames = true [interactive] diffFilter = delta --color-only [merge] tool = vimdiff conflictstyle = zdiff3 [delta] # [dandavison/delta: A syntax-highlighting pager for git, diff, and grep output](https://github.com/dandavison/delta) syntax-theme= Visual Studio Dark+ navigate = true side-by-side = true line-numbers = true [filter "lfs"] required = true clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process [diff "exif"] textconv = exiftool [difftool "kommitdiff"] cmd = kommitdiff \"$LOCAL\" \"$REMOTE\" [mergetool "kommitmerge"] cmd = kommitmerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" trustExitCode = true [maintenance] repo = /home/jaandrle/Vzdálené/GitHub/dcp-fe-container-certifedpassport repo = /home/jaandrle/Vzdálené/GitHub/DHLC-Internet-Networking-old repo = /home/jaandrle/Vzdálené/GitHub/DGF-Certified-Supervisory-Academy [submodule] recurse = true [format] coverLetter = auto compactSummary = true minimal = true signOff = true outputDirectory = .patches thread = shallow numbered = auto [am] # keepcr = true # to preserve line endings threeWay = true [include] path = ./identities/current.conf