summaryrefslogtreecommitdiffstats
path: root/config/git
diff options
context:
space:
mode:
Diffstat (limited to 'config/git')
-rw-r--r--config/git/config13
-rw-r--r--config/git/ignore7
2 files changed, 20 insertions, 0 deletions
diff --git a/config/git/config b/config/git/config
new file mode 100644
index 0000000..a5dd072
--- /dev/null
+++ b/config/git/config
@@ -0,0 +1,13 @@
+[user]
+ name = Mitsuo Tokumori
+[diff]
+ # used with $ git difftool
+ tool = nvim -d
+ submodule = log
+[merge]
+ tool = nvim -d
+[gitweb]
+ owner = Mitsuo Tokumori <[email protected]>
+[init]
+ defaultBranch = master
diff --git a/config/git/ignore b/config/git/ignore
new file mode 100644
index 0000000..d71d05b
--- /dev/null
+++ b/config/git/ignore
@@ -0,0 +1,7 @@
+# gitconfig file in ~/.config/git/config (if not in ~/.gitconfig)
+
+# Vim
+*.swp
+
+# KDE
+.directory