dot_gitconfig.tmpl

# Rendered by chezmoi (mode=symlink, but .tmpl files are rendered, not linked).
# [user] is templated from chezmoi data (replaces the old git/.gituserconfig
# stub + ~/.gitconfig include-path hack that Fresh wired up).
[user]
  name = {{ .name }}
  email = {{ .email }}
{{- if .signingkey }}
  signingkey = {{ .signingkey }}
{{- end }}

[core]
  editor = emacs --no-splash -nw
  excludesfile = ~/.gitignore
  attributesfile = ~/.gitattributes
[color]
  ui = always
  diff = true
[init]
  defaultBranch = main
{{- if .signingkey }}
# Sign commits when a signing key is configured (prompted once at `chezmoi init`,
# blank on machines without a key -> unsigned, no broken commits).
[commit]
  gpgsign = true
{{- end }}
[rerere]
  enabled = true
  autoupdate = true
[status]
  showStash = true
# --- Multi-account routing & URL shorthands ---------------------------------
# Personal repos route through the github-simshanith SSH alias so the *personal*
# key is used. On a work machine the default github.com key is the work identity,
# so without this a simshanith clone would auth as the wrong account. Longer
# prefix wins, so this beats any general github.com rule. (See ~/.ssh/config.)
[url "git@github-simshanith:simshanith/"]
  insteadOf = "https://github.com/simshanith/"
  insteadOf = "git@github.com:simshanith/"
  insteadOf = "git://github.com/simshanith/"

# Convenience shorthands. Everything else on github.com keeps HTTPS + the gh
# credential helper below (upstream's default), rather than a blanket https->ssh.
[url "git@github.com:"]
  insteadOf = "gh:"
[url "git@gist.github.com:"]
  insteadOf = "gst:"

[push]
  default = simple
  autoSetupRemote = true

[diff]
  algorithm = patience

# alias {{ "{{{" }}
[alias]
  st = status -s

  cl = clone

  ci = commit
  cm = commit -m
  cma = commit -a -m
  ca = commit --amend
  amend = commit --amend
  caa = commit -a --amend -C HEAD
  filelog = log -u
  fl = log -u

  ai = add --interactive

  co = checkout
  br = branch 
  #"!git branch -ra | grep -v done"
  bra = branch -ra
  #list commands
  le = log --oneline --decorate
  ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
  ls1 = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
  lds = log --pretty=format:"%C(yellow)%h\\ %C(green)%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short --graph
  ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
  lc  = "!f() { git ll "$1"^.."$1"; }; f"
  lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
  #list all aliases
  la = "!git config -l | grep alias | cut -c 7-"
  #diff = diff --word-diff
  d = diff --word-diff
  dc = diff --cached
  #list modified files in last commit
  dl = "!git ll -1"
  #diff last commit
  dlc = diff --cached HEAD^
  dr  = "!f() { git diff -w "$1"^.."$1"; }; f"
  diffr  = "!f() { git diff "$1"^.."$1"; }; f"
  branch = branch -ra

  #reset commands
  r = reset
  r1 = reset HEAD^
  r2 = reset HEAD^^
  rh = reset --hard
  rh1 = reset HEAD^ --hard
  rh2 = reset HEAD^^ --hard

  #git svn
  svnr = svn rebase
  svnd = svn dcommit
  svnl = svn log --oneline --show-commit

  #stash
  sl = stash list
  sa = stash apply
  ss = stash save

  cp = cherry-pick
  grep = grep -Ii
  gr = grep -Ii
  #grep from root folder
  gra = grep --full-name -In :/

  #grep on filename
  f = "!git ls-files | rg -i"

  #rename branch tree to done-
  done = "!f() { git branch | grep "$1" | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f"

  #assume aliases
  assume = update-index --assume-unchanged
  unassume = update-index --no-assume-unchanged
  #show assumed files
  assumed = "!git ls-files -v | rg '^h' | cut -c 3-"
  #unassume all the assumed files
  unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
  assumeall = "!git st -s | awk {'print $2'} | xargs git assume"

  lasttag = describe --tags --abbrev=0
  lt = describe --tags --abbrev=0

  #merges
  ours = "!f() { git co --ours $@ && git add $@; }; f"
  theirs = "!f() { git co --theirs $@ && git add $@; }; f"

  #list remotes
  rem="!git config -l | grep remote.*url | tail -n +2"

  #apply patch from other local repo
  lap = "!f() { git --git-dir=$1 format-patch -k -1 --stdout $2 | git am -3 -k; }; f"

  #subtree add
  sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f" 
  # initial empty commit
  empty = "!git commit -am\"[empty] Initial commit\" --allow-empty"
# {{ "}}}" }}

# GitHub HTTPS auth via gh, resolved through mise (version- and PATH-agnostic).
# Gated on gh being resolvable through mise (not just on PATH), so this is a
# no-op on machines lacking mise or the gh tool, and correct even when mise
# isn't shell-activated during `chezmoi apply`.
{{ if output "sh" "-c" "mise which gh 2>/dev/null || true" | trim -}}
[credential "https://github.com"]
	helper =
	helper = !mise exec -- gh auth git-credential
[credential "https://gist.github.com"]
	helper =
	helper = !mise exec -- gh auth git-credential
{{ end -}}

# Machine-local git overrides (identity, corp URL rewrites, credential helpers,
# ...). Included last so it can override anything above. git silently ignores a
# missing include path, so this is a no-op on machines that don't have the file.
# Personal machines leave it absent; a private overlay (if any) writes it.
[include]
	path = ~/.config/git/local