caio.co/de/dotfiles


git: use $EDITOR 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
59
60
61
62
63
64
65
66
67
68
69
70
71
# vim: noet:sw=8
[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
	mt = mergetool
	unstage = reset HEAD --
	revname = name-rev --name-only --refs=refs/heads/*
	changed = diff --name-status -r
	findoldfile = rev-list -n 1 HEAD --
	fixup = commit --amend --no-edit
	news = log --reverse --no-merges --stat @{1}..

[core]
	whitespace = blank-at-eol,space-before-tab,tab-in-indent
	preloadindex = true
	excludesfile = ~/.gitignore

[color]
	ui = auto

[merge]
	tool = vimdiff
	conflictstyle = diff3
	prompt = false

[rebase]
	stat = true

[diff]
	renames = copies
	noprefix = true
	wordRegex = [^[:space:]]
	compactionHeuristic = true
	algorithm = patience
	relative = true

[difftool "nvim"]
	cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\"


[log]
	decorate = short

[push]
	default = upstream

[branch]
	autosetuprebase = always
	autosetupmerge = always
[commit]
	verbose = true

[mergetool]
	keepBackup = false

[mergetool "nvimdiff"]
	cmd = nvim -d \"$LOCAL\" \"$MERGED\" \"$BASE\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd J\"

[init]
	defaultBranch = main
[pull]
	rebase = true
[fetch]
	prune = true