summaryrefslogtreecommitdiff
path: root/git/config
blob: 264acf229f0310451af8387d8fc3b0992622b5d9 (plain)
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
[alias]
  br   = branch
  co   = checkout
  di   = diff
  dis  = diff --staged
  fa   = fetch --all --prune
  gi   = grep -i
  root = rev-parse --show-toplevel
  st   = status

[branch]
  autoSetupRebase = always

[diff]
  algorithm = histogram

[grep]
  lineNumber = true

[init]
  defaultBranch = main

[merge]
  conflictStyle = zdiff3

[pull]
  ff = only

[push]
  followTags = true

[user]
  name = Grégoire Duchêne