aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitconfig
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2016-04-25 18:46:05 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2016-04-25 18:46:05 +0300
commit5218b3e97baf19270912089ac373ab3d1c0a6a3b (patch)
treedb91c58cae6c1e005533f09f9151982b6e5aa067 /.gitconfig
downloadlinux-home-5218b3e97baf19270912089ac373ab3d1c0a6a3b.tar.gz
linux-home-5218b3e97baf19270912089ac373ab3d1c0a6a3b.zip
initial commit
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig25
1 files changed, 25 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..b089ca6
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,25 @@
+[user]
+ name = Egor Tensin
+ email = Egor.Tensin@gmail.com
+[core]
+ editor = vim
+ ignorecase = false
+ autocrlf = true
+[push]
+ default = current
+[merge]
+ tool = kdiff3
+[mergetool "kdiff3"]
+ trustExitCode = false
+[mergetool]
+ keepBackup = false
+[diff]
+ tool = kdiff3
+[difftool]
+ keepBackup = false
+[difftool "kdiff3"]
+ trustExitCode = false
+[pull]
+ ff = only
+[config]
+ autocrlf = true