From 46634ae0283b47199cf8891a225cee9062eb8d9e Mon Sep 17 00:00:00 2001 From: Bob Williams Date: Mon, 24 Feb 2014 11:18:14 -0500 Subject: [PATCH 1/2] adding a better log command based on http://fredkschott.com/post/2014/02/git-log-is-so-2005/ --- plugins/git/git.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 1285a3247..9e86882b5 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -74,6 +74,7 @@ alias grh='git reset HEAD' alias grhh='git reset HEAD --hard' alias gclean='git reset --hard && git clean -dfx' alias gwc='git whatchanged -p --abbrev-commit --pretty=medium' +alias glg='git log --color --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset" --abbrev-commit' #remove the gf alias #alias gf='git ls-files | grep' From a06af8e890e7c6e606a06f7a8001d3643411ae2c Mon Sep 17 00:00:00 2001 From: Bob Williams Date: Wed, 26 Feb 2014 19:22:47 -0500 Subject: [PATCH 2/2] Adds command line aliases useful for dealing with JSON --- plugins/jsontools/jsontools.plugin.zsh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 plugins/jsontools/jsontools.plugin.zsh diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh new file mode 100644 index 000000000..51578b349 --- /dev/null +++ b/plugins/jsontools/jsontools.plugin.zsh @@ -0,0 +1,14 @@ +# JSON Tools +# Adds command line aliases useful for dealing with JSON + +if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then + JSONTOOLS_METHOD="" +fi + +if [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then + alias pp_json='python -mjson.tool' +elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then + alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"' +fi + +unset JSONTOOLS_METHOD \ No newline at end of file