diff --git a/fish/.config/fish/functions/gall.fish b/fish/.config/fish/functions/gall.fish new file mode 100644 index 0000000..cb0418d --- /dev/null +++ b/fish/.config/fish/functions/gall.fish @@ -0,0 +1,5 @@ +# Defined in /tmp/fish.sXa0jy/gall.fish @ line 2 +function gall + find ~/workspace -type d -name .git -print0 \ + | xargs -0 -n1 -I% git --git-dir=% --work-tree=%/.. $argv +end diff --git a/fish/.config/fish/functions/tht.fish b/fish/.config/fish/functions/tht.fish deleted file mode 100644 index 177a066..0000000 --- a/fish/.config/fish/functions/tht.fish +++ /dev/null @@ -1,8 +0,0 @@ -# Defined in /tmp/fish.aHcCMP/tht.fish @ line 2 -function tht - if test -f ~/.tht/bin/tht.php - php ~/.tht/bin/tht.php $argv - else - echo tht not installed - end -end diff --git a/git/.gitconfig b/git/.gitconfig index d638717..822788b 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -13,6 +13,9 @@ [pull] ff = only +[diff] + colorMoved = default + [diff "gpg"] textconv = gpg --no-tty --decrypt cachetextconv = false @@ -35,6 +38,7 @@ ap = add --patch local = log --oneline --no-merges ${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}..HEAD upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')} + cv = commit --verbose [rerere] enabled = true [merge]