about summary refs log tree commit diff stats
path: root/linux/conf/skel/.gitconfig
diff options
context:
space:
mode:
authorpunk <punk@libernaut>2021-04-21 15:26:19 +0100
committerpunk <punk@libernaut>2021-04-21 15:26:19 +0100
commiteac48b5a8d709135a95abcc2243b369095f074f4 (patch)
treea2e34d995cef5ac8068ec7047e93b1125c80d175 /linux/conf/skel/.gitconfig
parent3bd43803fc8cb7a39a87394cb7c491ddc151e06b (diff)
parent452477a2635d85ecf772a5242ce97d9479503bb3 (diff)
downloaddoc-eac48b5a8d709135a95abcc2243b369095f074f4.tar.gz
release 0.7.0
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