dotfiles/gitconfig at master · exchgr/dotfiles · 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
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
[user]
  name = Elle Mundy
  email = exchgr@icloud.com
[github]
  user = exchgr
[core]
  excludesfile = ~/.gitignore_global
  quotepath = false
  pager = less -FRX
  editor = $GIT_EDITOR
  compression = 9
	sshCommand = ssh -i ~/.ssh/id_ed25519
[init]
	defaultBranch = main
[color]
  diff = auto
[merge]
  tool = vimdiff
[mergetool]
  prompt = false
[diff]
  tool = vimdiff
[difftool]
  prompt = false
[alias]
  a = add
  an = add -N
  ap = add -p
  b = branch
  ba = branch -a
  bc = rev-parse --abbrev-ref HEAD
  bd = !git branch -D
  c = !git commit -v
  ca = !git commit -av
  cam = !git commit --amend -v
  camw = !git cam --author=\"$NAME <$WORK_EMAIL>\"
  cl = clone
  cm = !git commit -amv
  co = checkout
  cob = !git checkout -b
  cot = !git checkout --track
  cp = cherry-pick
  cpa = cherry-pick --abort
  cpc = cherry-pick --continue
  cw = !git commit -v --author=\"$NAME <$WORK_EMAIL>\"
  d = diff
  dc = diff --cached
  dcs = diff --cached --stat
  dhh = diff HEAD^ HEAD
  dm = diff origin/master
  ds = diff --stat
  dsm = diff --stat origin/master
  dt = difftool
  dtc = difftool --cached
  f = fetch
  h = hash
  hash = rev-parse head
  l = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ad - %ar) %C(bold blue)%an <%ae / %ce>%Creset' --abbrev-commit
  lh = !git log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)%an <%ae / %ce>%Creset' --abbrev-commit | head
  lm = !git l origin/master..`git bc`
  m = !echo "mff or mnoff?"
  mb = merge-base
  MERGEBRANCHFF = !git rbm && git co master && git u && git mff - && git p
  MERGEBRANCHNOFF = !git rbm && git co master && git u && git mnoff - && git p
  mnoff = merge --no-ff
  mff = merge --ff-only
  ms = merge --squash
  ma = merge --abort
  mt = mergetool
  own = codeowners
  p = push
  pf = push --force-with-lease
  pu = !git push -u origin `git bc`
  r = remote
  ra = remote add
  rb = rebase
  rba = rebase --abort
  rbc = rebase --continue
  rbd = !git push origin --delete
  rbi = rebase -i
  rbm = !git urb origin master && git pf
  rbs = rebase --skip
  rl = reflog
  rr = remote rm
  rv = remote -v
  s = status
  sa = submodule add
  ss = show --stat
  st = stash
  sta = stash apply
  stc = stash clear
  std = stash drop
  stl = stash list
  stp = stash pop
  sts = stash show
  stsp = stash show -p
  su = submodule update
  sui = submodule update --init
  u = pull
  urb = pull --rebase
  urbi = pull --rebase=interactive
[difftool "vimdiff"]
  cmd = $(echo $GIT_EDITOR) -d -R $LOCAL $REMOTE
[mergetool "vimdiff"]
  cmd = $(echo $GIT_EDITOR) -d $MERGED
  keepBackup = false
[web]
  browser = open
[push]
	default = simple
[credential]
	helper = osxkeychain
[rerere]
	enabled = true
[pull]
	rebase = true