gitconfig - dotfiles

nvimdiff mergetool setup by Caio 2 years ago (log)

Blob gitconfig

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

[user]
	name = Caio
	email = contact@caio.co
	signingkey = caioromao@gmail.com

[alias]
	ci = commit -v
	co = checkout
	st = status -sb --ignore-submodules
	br = branch -v
	unstage = reset HEAD --
	changed = diff --name-status -r
	fixup = commit --amend --no-edit
	news = log --reverse --stat @{1}..

[color]
	ui = auto

[merge]
	tool = nvimdiff

[rebase]
	stat = true

[format]
	pretty = fuller

[diff]
	noprefix = true
	tool = nvimdiff

[log]
	decorate = short

[push]
	default = upstream

[branch]
	autosetuprebase = always
	autosetupmerge = simple

[commit]
	verbose = true

[mergetool]
	keepBackup = false

[mergetool "nvimdiff"]
	layout = "LOCAL,BASE,REMOTE / MERGED"

[init]
	defaultBranch = main

[pull]
	rebase = true

[fetch]
	prune = true