summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/git/config21
-rw-r--r--config/git/ignore24
-rw-r--r--config/git/user.personal3
-rw-r--r--config/git/user.work3
4 files changed, 51 insertions, 0 deletions
diff --git a/config/git/config b/config/git/config
new file mode 100644
index 0000000..32f11aa
--- /dev/null
+++ b/config/git/config
@@ -0,0 +1,21 @@
+[color]
+	ui = true
+
+[push]
+	default = simple
+
+[core]
+	whitespace = trailing-space,space-before-tab
+
+[branch]
+	autosetuprebase = remote
+
+[include]
+	path = ~/.config/git/user
+
+[http]
+	postBuffer = 524288000
+
+[alias]
+	s = status --short --branch
+	amend = commit --amend --no-edit
diff --git a/config/git/ignore b/config/git/ignore
new file mode 100644
index 0000000..c8124cb
--- /dev/null
+++ b/config/git/ignore
@@ -0,0 +1,24 @@
+# osx stuff
+.DS_Store
+Icon
+
+# ide
+.idea
+*.iml
+/env/*
+
+# python stuff
+.flake8rc
+*pyc
+
+# ctags stuff
+TAGS
+tags
+
+# emacs stuff
+.projectile
+.dir-locals.el
+.pytest_cache/
+
+.reviewboardrc
+ui/package-lock.json
diff --git a/config/git/user.personal b/config/git/user.personal
new file mode 100644
index 0000000..092c2f1
--- /dev/null
+++ b/config/git/user.personal
@@ -0,0 +1,3 @@
+[user]
+    name = Franck Cuny
+    email = franck@fcuny.net
diff --git a/config/git/user.work b/config/git/user.work
new file mode 100644
index 0000000..d95b398
--- /dev/null
+++ b/config/git/user.work
@@ -0,0 +1,3 @@
+[user]
+    name = Franck Cuny
+    email = fcuny@twitter.com