aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gitconfig1
m---------private0
-rw-r--r--pylintrc4
-rw-r--r--vim/filetype.vim1
4 files changed, 4 insertions, 2 deletions
diff --git a/gitconfig b/gitconfig
index 696d4ab..ff04b4d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -28,6 +28,7 @@
type = cat-file -t
dump = cat-file -p
please = push --force-with-lease
+ fclean = "!git clean -xdff && git submodule foreach git clean -xdff && :"
cleanup = "!git branch --merged HEAD --format=\"%(refname:lstrip=2)\" | grep -vx master | xargs git branch -d"
[sendemail]
identity = karel.koci@nic.cz
diff --git a/private b/private
-Subproject 9fa3c3e16069e29aedfb8527cc597fbbb5d7022
+Subproject 2e94c1c26bd82b662200d1b116e4931b52c2834
diff --git a/pylintrc b/pylintrc
index a986913..8ac2c7b 100644
--- a/pylintrc
+++ b/pylintrc
@@ -1,5 +1,5 @@
[FORMAT]
-max-line-length = 120
+max-line-length = 80
[MESSAGES CONTROL]
-disable = C0330,C0326,W503
+disable = C0326,W503
diff --git a/vim/filetype.vim b/vim/filetype.vim
index d3153c0..dd640b5 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -1 +1,2 @@
au BufNewFile,BufRead *.am setf automake
+au BufNewFile,BufRead .clang-format setf yaml