Remove git hooks

diff --git a/.bashrc b/.bashrc
index 3551ddfbbfa32595e40751e8a3e131f104c4c9d6..05d73af699487d24d373e715ca307a038e4bf0df 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -13,3 +13,4 @@ done;
 
 # last line
 [ -f ~/.bashrc_local ] && . ~/.bashrc_local
+LS_COLORS="ow=01;36;40" && export LS_COLORS

diff --git a/.config/git/config b/.config/git/config
index cf4929f33ebf446b09082dd66689d1d574b982de..4d9d1aa3a602052ceffdaacf2513ea52dc5519d5 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -70,7 +70,8 @@
        ctags = "!sh -c '[ -f .git/hooks/ctags ] || git init; .git/hooks/ctags' git-ctags"
        gtags = "!sh -c '[ -f .git/hooks/gtags ] || git init; .git/hooks/gtags' git-gtags"
        cscope = "!sh -c '[ -f .git/hooks/cscope ] || git init; .git/hooks/cscope' git-cscope"
-       
+       mydiff = difftool --dir-diff --tool=bc --no-prompt
+
 [help]
        autocorrect = 10
 [branch]
@@ -85,13 +86,23 @@
        default = simple
 [diff]
        tool = vimdiff
-[difftool]
-       prompt = false
 [merge]
        tool = vimdiff
+[difftool "vimdiff"]
+       prompt = false
        conflictstyle = diff3
-[mergetool]
+[mergetool "vimdiff"]
        prompt = false
+#[diff]
+#      tool = bc
+#[merge]
+#      tool = bc
+#[difftool "bc"]
+#      path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
+#      trustExitCode = false
+#[mergetool "bc"]
+#      path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
+#      trustExitCode = false
 [init]
        templatedir = ~/.config/git/templates
 [core]

diff --git a/.config/git/templates/hooks/cscope b/.config/git/templates/hooks/cscope
deleted file mode 100755 (executable)
index d625a41..0000000
--- a/.config/git/templates/hooks/cscope
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh\r
-set -e\r
-PATH="/usr/local/bin:$PATH"\r
-dir="`git rev-parse --git-dir`"\r
-trap 'rm -f "$dir/$$.cscope.out"' EXIT INT TERM\r
-git ls-files |\\r
-  grep -E '\.(c(pp)?|h)$' |\\r
-  awk '{print "\""$0"\""}' |\\r
-  cscope -R -b -i - -f "$dir/$$.cscope.out"\r
-mv "$dir/$$.cscope.out" "$dir/cscope.out"\r

diff --git a/.config/git/templates/hooks/ctags b/.config/git/templates/hooks/ctags
deleted file mode 100755 (executable)
index 774d101..0000000
--- a/.config/git/templates/hooks/ctags
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh\r
-set -e\r
-PATH="/usr/local/bin:$PATH"\r
-dir="`git rev-parse --git-dir`"\r
-trap 'rm -f "$dir/$$.tags"' EXIT INT TERM\r
-git ls-files | \\r
-  ctags --tag-relative -L - -f"$dir/$$.tags" --languages=-javascript,sql\r
-mv "$dir/$$.tags" "$dir/tags"\r

diff --git a/.config/git/templates/hooks/gtags b/.config/git/templates/hooks/gtags
deleted file mode 100755 (executable)
index 3e8e848..0000000
--- a/.config/git/templates/hooks/gtags
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh\r
-set -e\r
-PATH="/usr/local/bin:$PATH"\r
-dir="`git rev-parse --git-dir`"\r
-trap 'rm -rf "$dir/$$.gtags/"' EXIT INT TERM\r
-mkdir "$dir/$$.gtags"\r
-git ls-files | \\r
-  gtags --file=- --skip-unreadable "$dir/$$.gtags"\r
-mv "$dir/$$.gtags"/* "$dir/.."\r

diff --git a/.config/git/templates/hooks/post-applypatch b/.config/git/templates/hooks/post-applypatch
deleted file mode 100755 (executable)
index be09ac7..0000000
--- a/.config/git/templates/hooks/post-applypatch
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh\r
-.git/hooks/ctags >/dev/null 2>&1 &\r
-.git/hooks/gtags >/dev/null 2>&1 &\r
-.git/hooks/cscope >/dev/null 2>&1 &\r
-\r
-\r
-\r

diff --git a/.config/git/templates/hooks/post-checkout b/.config/git/templates/hooks/post-checkout
deleted file mode 100755 (executable)
index ca24a88..0000000
--- a/.config/git/templates/hooks/post-checkout
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh\r
-.git/hooks/ctags >/dev/null 2>&1 &\r
-.git/hooks/gtags >/dev/null 2>&1 &\r
-.git/hooks/cscope >/dev/null 2>&1 &\r

diff --git a/.config/git/templates/hooks/post-commit b/.config/git/templates/hooks/post-commit
deleted file mode 100755 (executable)
index ca24a88..0000000
--- a/.config/git/templates/hooks/post-commit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh\r
-.git/hooks/ctags >/dev/null 2>&1 &\r
-.git/hooks/gtags >/dev/null 2>&1 &\r
-.git/hooks/cscope >/dev/null 2>&1 &\r

diff --git a/.config/git/templates/hooks/post-merge b/.config/git/templates/hooks/post-merge
deleted file mode 100644 (file)
index ca24a88..0000000
--- a/.config/git/templates/hooks/post-merge
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh\r
-.git/hooks/ctags >/dev/null 2>&1 &\r
-.git/hooks/gtags >/dev/null 2>&1 &\r
-.git/hooks/cscope >/dev/null 2>&1 &\r

diff --git a/.config/git/templates/hooks/post-rewrite b/.config/git/templates/hooks/post-rewrite
deleted file mode 100755 (executable)
index aed59b9..0000000
--- a/.config/git/templates/hooks/post-rewrite
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh\r
-case "$1" in\r
-  rebase) exec .git/hooks/post-merge ;;\r
-esac\r

diff --git a/.vimrc b/.vimrc
index 9750ff84ffa0404571338826bbffeec831e9f5c3..8a5439ea71b31ea672929b9d31ab649f54aeb9c1 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -33,13 +33,13 @@ Plug 'scrooloose/syntastic'
 Plug 'airblade/vim-gitgutter'
 Plug 'majutsushi/tagbar'
 Plug 'fholgado/minibufexpl.vim'
-Plug 'brookhong/cscope.vim'
+"Plug 'brookhong/cscope.vim'
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'brandonbloom/csearch.vim'
 Plug 'mileszs/ack.vim'
 Plug 'jeetsukumaran/vim-filesearch'
 Plug 'haya14busa/incsearch.vim'
-Plug 'altercation/vim-colors-solarized'
+"Plug 'altercation/vim-colors-solarized'
 Plug 'editorconfig/editorconfig-vim'
 Plug 'johnsyweb/vim-makeshift'
 Plug 'tfnico/vim-gradle'