about summary refs log tree commit diff stats
path: root/linux/conf/skel/.gitconfig
blob: 730d8d9258e168d200744dddd081ddc04e4812b5 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
[core]
	pager = less -F -X
	editor = vim
[diff]
	tool = vimdiff
[merge]
	tool = vimdiff
	conflictstyle = diff3
[difftool]
	prompt = false