profile/gitconfig at master · pattivacek/profile · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
[user]
  name = Patti Vacek
  email = pattivacek@gmail.com
  signingkey=148011C8B954ACB0AF4435D540877B37211A1173
[alias]
  co = checkout
  br = branch
  ci = commit
  st = status
  unstage = reset HEAD --
  sh = show --color
  last = show --stat
  changed = show --name-only --pretty="format:"
  l = log --name-status --decorate --color
  lg = log --oneline --decorate --color --graph
  lga = log --oneline --decorate --color --graph --all
  # https://stackoverflow.com/questions/7853332/how-to-change-git-log-date-formats
  lg2 = log --graph --abbrev-commit --decorate --color --date=format:'%Y-%m-%d %H:%M' --format=format:'%C(bold blue)%h%C(reset) %C(bold cyan)(%ad)%C(reset) %C(bold yellow)%d%C(reset) %s %C(dim white)- %an%Creset'
  lga2 = log --graph --abbrev-commit --decorate --color --date=format:'%Y-%m-%d %H:%M' --format=format:'%C(bold blue)%h%C(reset) %C(bold cyan)(%ad)%C(reset) %C(bold yellow)%d%C(reset) %s %C(dim white)- %an%Creset' --all
  d = diff --color -M
  sd = diff --color -M --staged
  wd = diff --color -M -w
  swd = diff --color -M --staged -w
  prev = show --name-only --pretty="format:"
  cur = diff --name-only --pretty="format:"
  staged = diff --name-only --pretty="format:" --staged
  delete-merged = ! git branch --merged | grep -v '\\*' | egrep -vw '(master|main|dunfell|gatesgarth|hardknott|honister|kirkstone)' | xargs -n 1 git branch -d
  untr = ls-files --others --exclude-standard
  new = untr
  unstage = ! git restore --staged $(git staged)
  pfusch = push --force-with-lease
[color]
  ui = auto
[core]
  editor = vim
  pager = less -R
[commit]
  gpgsign = true

# https://blog.gitbutler.com/how-git-core-devs-configure-git/
[tag]
  sort = version:refname
[init]
  defaultBranch = main
[diff]
  algorithm = histogram
  colorMoved = plain
  mnemonicPrefix = true
  renames = true
[push]
  autoSetupRemote = true
[fetch]
  prune = true
  pruneTags = true
  all = true
[help]
  autocorrect = prompt
[commit]
  verbose = true
[rerere]
  enabled = true
  autoupdate = true
[rebase]
  autoSquash = true
  autoStash = true
  # updateRefs = true # this messes with how I like to have backup branches
[merge]
  conflictstyle = zdiff3
[pull]
  rebase = true