diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2012-10-30 16:59:06 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2012-10-30 16:59:06 +0100 |
| commit | 5640b4787396e2350ce3546fc9a682a13b0da75f (patch) | |
| tree | ef9b5386a46a34687898b9209a840241a6974c86 | |
| parent | 2afff89115115c9d3253cd3c9257b017a004ec61 (diff) | |
| parent | dcc2f0b098efd43ff7b172e471ece5739ea5ad3d (diff) | |
Merge branch 'master' of git:zdotdir
Conflicts:
99_Exec.zsh
| -rw-r--r-- | 01_Internal.zsh | 2 | ||||
| -rw-r--r-- | net:foret/completion/_sdk-targets | 2 | ||||
| -rw-r--r-- | user:hugues/GusBindings.zsh | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/01_Internal.zsh b/01_Internal.zsh index 48f3dcf..c7297fe 100644 --- a/01_Internal.zsh +++ b/01_Internal.zsh @@ -314,7 +314,7 @@ __get_git_status () fi fi - if [ $(git status | sed -n '2{/can be fast-forwarded/p};3q' | wc -l) -gt 0 ] + if [ $(git status | sed -n '2{/can be fast-forwarded/p;/have diverged/p};3q' | wc -l) -gt 0 ] then my_git_status+=";$_gcl_colors[ffwd]" fi diff --git a/net:foret/completion/_sdk-targets b/net:foret/completion/_sdk-targets index a013881..3428566 100644 --- a/net:foret/completion/_sdk-targets +++ b/net:foret/completion/_sdk-targets @@ -1,4 +1,4 @@ -#compdef sdk-factory.sh sdk-patch.sh sdk-test.sh sdk-qa.sh set-target-build-env.sh +#compdef sdk-factory.sh sdk-patch.sh sdk-test.sh sdk-qa.sh set-target-build-env.sh sdk-check.sh _sdk-targets() { diff --git a/user:hugues/GusBindings.zsh b/user:hugues/GusBindings.zsh index 8bdfbb0..8a65b85 100644 --- a/user:hugues/GusBindings.zsh +++ b/user:hugues/GusBindings.zsh @@ -211,6 +211,11 @@ do bindkey -M $keymap -s '^[t' '^[Q todo\n' bindkey -M $keymap -s '^[T' '^[Q todo all -c\n' fi + if ( __cmd_exists rt ) + then + bindkey -M $keymap -s '^[t' '^[Q mytickets.sh\n' + bindkey -M $keymap -s '^[T' '^[Q mytickets.sh -a\n' + fi bindkey -M $keymap -s '^[c' '^[Q ./configure\n' bindkey -M $keymap -s '^[©' '^[Q !?configure\n' @@ -225,6 +230,8 @@ do bindkey -M $keymap -s '^[g' '^[Q git st .\n' bindkey -M $keymap -s '^[G' '^[Q git fetchall\n' + bindkey -M $keymap -s '^[E' '^[Q eval $( !! )' + bindkey -M $keymap -s '^[S' '^[Q sudo !!' bindkey -M $keymap -s '^[X' '^[Q up_up ; exec zsh -l\n' |