dotfiles/gitconfig at main · cjoudrey/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
[user]
  name = Christian Joudrey
  email = cmallette@gmail.com
#  signingkey = A4A37924

[color]
  ui = auto
  interactive = auto

[core]
  editor = nvim

[merge]
  tool = vimdiff
  conflictstyle = diff3

[mergetool "diffmerge"]
  cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
  trustExitCode = false

[alias]
  st = status
  co = commit
  br = branch
  ch = checkout
	sync = !git fetch origin main && git rebase origin/main && git push origin +$(git symbolic-ref --short HEAD)

[branch]
  autosetuprebase = always

[include]
  path = .github

[push]
  default = current

[hub]
  protocol = https

[pull]
  rebase = true

#[gpg]
#  program = /usr/local/bin/gpg2
#
#[commit]
#  gpgsign = true