dotfiles/.gitconfig at main · jarmentor/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
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
[init]
  defaultBranch = main

[user]
  name = Jonathan Armentor
  email = jonathan@jonathanarmentor.dev

[core]
  editor = nvim
  autocrlf = false
  excludesfile = ~/.gitignore
  attributesfile = ~/.gitattributes
  whitespace = space-before-tab,-indent-with-non-tab,trailing-space

[includeIf "gitdir:/Volumes/Development/Comit/"]
  path = ~/.gitconfig-comit

[includeIf "gitdir:/Volumes/Development/Personal/"]
  path = ~/.gitconfig-personal

[rerere]
  enabled = true
  autoupdate = true

[fetch]
  prune = true
  prunetags = true

[advice]
  pushNonFastForward = false

[color]
  ui = auto

[color "status"]
  added = green
  changed = yellow
  untracked = red

[color "branch"]
  current = yellow reverse
  remote = green

[color "diff"]
  meta = yellow
  frag = magenta
  new = green
  old = red

[diff]
  algorithm = histogram
  colorMoved = default

[alias]
  br = branch
  co = checkout
  d = diff
  l = log --oneline --decorate --color --all
  mt = mergetool
  s = status
  sh = show
  st = stash
  reb = "!r() { git rebase -i HEAD~$1; }; r"
  amend = commit --amend --reuse-message=HEAD
  count = rev-list --count
  graph = log --oneline --decorate --graph --all
  last = log -1 HEAD
  patch = log -p
  unstage = reset HEAD --
  whoami = config user.email
  lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit

  # Show verbose output about tags, branches or remotes
  tags = tag -l
  branches = branch --all
  remotes = remote --verbose

  # List aliases
  aliases = config --get-regexp alias

  # Rebase shortcuts
  rc = rebase --continue
  ra = rebase --abort
  rs = rebase --skip

  # Force push safely
  pf = push --force-with-lease

  # WIP commits
  wip = "!git add -A && git commit -m 'WIP'"
  unwip = reset HEAD~1

  # Show what you've done today
  today = log --since=midnight --author='Jonathan' --oneline

  # Delete branches whose remote tracking is gone
  gone = "!git fetch -p && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs -r git branch -D"

[log]
  date = iso-local

[apply]
  # detect whitespace errors when patching
  whitespace = fix

[push]
  followTags = true
  default = simple
  autoSetupRemote = true

[pull]
  rebase = true
  ff = only

[rebase]
  autoSquash = true
  autoStash = true
  updateRefs = true

[commit]
  verbose = true

[format]
  pretty = "%C(auto)%h%Creset %C(bold blue)%an%Creset %C(dim green)(%ad)%Creset%n    %s%n%b"

[filter "lfs"]
  required = true
  clean = git-lfs clean -- %f
  smudge = git-lfs smudge -- %f
  process = git-lfs filter-process

[merge]
  tool=nvim

[mergetool "nvim"]
  cmd = nvim -d $LOCAL $REMOTE
  trustExitCode = false