dotfiles/gitconfig at master · VovanR/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
# Inspired by:
# https://github.com/sapegin/dotfiles

[color]
	ui = auto

[color "diff"]
	meta = blue
	frag = white
	old = red bold
	new = green bold

# https://github.com/so-fancy/diff-so-fancy
[color "diff-highlight"]
	oldNormal = red bold
	oldHighlight = red bold 52
	newNormal = green bold
	newHighlight = green bold 22

[core]
	editor = vim
	autocrlf = false
	safecrlf = false
	excludesfile = ~/.gitignore_global
	pager = diff-so-fancy | less --tabs=4 -RFX

[merge]
	tool = vimdiff
	guitool = meld

[diff]
	tool = vimdiff
	guitool = meld

[mergetool]
	prompt = true
	keepBackup = false

[difftool]
	prompt = true

[mergetool "vimdiff"]
	cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
	trustExitCode = true

[difftool "vimdiff"]
	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'

[alias]
	co = checkout
	ci = commit
	commend = commit --amend --no-edit
	uncommit = reset --soft HEAD^
	cancellastcommit = reset --soft HEAD^
	st = status
	s = status -sb
	br = branch
	hist = log --pretty=format:\"%h %ad | [%an] %s%d\" --graph --date=short
	type = cat-file -t
	dump = cat-file -p
	my = !git log --branches=* --no-merges --pretty=format:'%C(reset)%C(bold)%cd %C(reset)%C(white)%s  %C(reset)%h' --date=short --author=\"$(git config user.name)\"
	lasthash = log --pretty=format:"%h" -n 1

[push]
	default = current

[credential]
	helper = cache

[init]
	defaultBranch = main

# Git GUI
[gui]
	fontui = -family Hack -size 10 -weight normal -slant roman -underline 0 -overstrike 0
	fontdiff = -family Hack -size 10 -weight normal -slant roman -underline 0 -overstrike 0

# Include local settings
# Requires Git 1.7.10
# git config -f ~/.gitlocal user.email "artem@sapegin.ru"
# git config -f ~/.gitlocal user.name "Artem Sapegin"
[include]
	path = .gitlocal

# ex: filetype=gitconfig