about summary refs log tree commit diff stats
path: root/linux/conf/skel/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'linux/conf/skel/.gitconfig')
-rw-r--r--linux/conf/skel/.gitconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/linux/conf/skel/.gitconfig b/linux/conf/skel/.gitconfig
new file mode 100644
index 0000000..730d8d9
--- /dev/null
+++ b/linux/conf/skel/.gitconfig
@@ -0,0 +1,10 @@
+[core]
+	pager = less -F -X
+	editor = vim
+[diff]
+	tool = vimdiff
+[merge]
+	tool = vimdiff
+	conflictstyle = diff3
+[difftool]
+	prompt = false