summaryrefslogtreecommitdiffstats
path: root/public/.config/git
diff options
context:
space:
mode:
Diffstat (limited to 'public/.config/git')
-rw-r--r--public/.config/git/config15
-rw-r--r--public/.config/git/ignore10
2 files changed, 25 insertions, 0 deletions
diff --git a/public/.config/git/config b/public/.config/git/config
new file mode 100644
index 0000000..ec672da
--- /dev/null
+++ b/public/.config/git/config
@@ -0,0 +1,15 @@
+[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
+[pull]
+ ff = only
diff --git a/public/.config/git/ignore b/public/.config/git/ignore
new file mode 100644
index 0000000..81f3e57
--- /dev/null
+++ b/public/.config/git/ignore
@@ -0,0 +1,10 @@
+# gitconfig file in ~/.config/git/config (if not in ~/.gitconfig)
+
+# Vim
+*.swp
+
+# KDE
+.directory
+
+# Python
+config.py