From eddab5034cb19caa99a1a0e381de4dcf63ef0fe0 Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Thu, 1 Oct 2009 08:55:07 +0100 Subject: run update check *after* running custom configuration scripts. This means we are running it after $PATH has potentially been set up, which means it's more likely that commands like "git" will be found --- lib/misc.zsh | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib') diff --git a/lib/misc.zsh b/lib/misc.zsh index 8d6727251..a01627d9e 100644 --- a/lib/misc.zsh +++ b/lib/misc.zsh @@ -7,11 +7,3 @@ bindkey "^[m" copy-prev-shell-word ## jobs setopt long_list_jobs - -# Check for updates on initial load... -if [ "$DISABLE_AUTO_UPDATE" = "true" ] -then - return -else - /bin/sh $ZSH/tools/check_for_upgrade.sh -fi -- cgit v1.2.3-70-g09d2 From 60e99779d5658841026acb84483a7deeb6851246 Mon Sep 17 00:00:00 2001 From: Markus Prinz Date: Sat, 3 Oct 2009 19:48:29 +0200 Subject: Make "-" an alias for "cd -" (cd back to previous directory) --- lib/aliases.zsh | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/aliases.zsh b/lib/aliases.zsh index cd17781a6..6f6c614f7 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -8,6 +8,7 @@ alias ss='thin --stats "/thin/stats" start' alias mr='mate CHANGELOG app config db lib public script spec test' alias .='pwd' alias ...='cd ../..' +alias -- -='cd -' alias _='sudo' alias ss='sudo su -' -- cgit v1.2.3-70-g09d2 From 7705ffaf0c38438b0e007f75553876cf5ae99803 Mon Sep 17 00:00:00 2001 From: Gerhard Lazu Date: Sun, 11 Oct 2009 09:56:22 +0100 Subject: Added git diff for vim (gdv) --- lib/aliases.zsh | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 6f6c614f7..c4388febb 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -20,6 +20,7 @@ alias gst='git status' alias gl='git pull' alias gp='git push' alias gd='git diff | mate' +alias gdv='git diff -w "$@" | vim -R -' alias gc='git commit -v' alias gca='git commit -v -a' alias gb='git branch' -- cgit v1.2.3-70-g09d2 From fdac2b3f04f7b2c42bab7c7f6b53d8c8d32b62a5 Mon Sep 17 00:00:00 2001 From: Gerhard Lazu Date: Sun, 11 Oct 2009 14:49:24 +0100 Subject: Added ack-grep searching --- lib/aliases.zsh | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/aliases.zsh b/lib/aliases.zsh index c4388febb..5f3582bd8 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -37,6 +37,7 @@ alias sl=ls # often screw this up alias sgem='sudo gem' alias rfind='find . -name *.rb | xargs grep -n' +alias afind='ack-grep -il' alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' -- cgit v1.2.3-70-g09d2 From 788c9af05684f4b9e39e7f15de2c06c4c8291cbd Mon Sep 17 00:00:00 2001 From: Gerhard Lazu Date: Sun, 11 Oct 2009 15:09:10 +0100 Subject: Added more aliases for Rails & git --- lib/aliases.zsh | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 5f3582bd8..273bcc679 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -2,8 +2,14 @@ alias pu='pushd' alias po='popd' alias sc='ruby script/console' +alias sdb='ruby script/dbconsole' alias sd='ruby script/server --debugger' alias ss='thin --stats "/thin/stats" start' +alias sg='ruby script/generate' +alias sd='ruby script/destroy' +alias sp='ruby script/plugin' +alias ssp='ruby script/spec' +alias rdbm='rake db:migrate' alias mr='mate CHANGELOG app config db lib public script spec test' alias .='pwd' @@ -18,6 +24,7 @@ alias ss='sudo su -' alias g='git' alias gst='git status' alias gl='git pull' +alias gup='git fetch && git rebase' alias gp='git push' alias gd='git diff | mate' alias gdv='git diff -w "$@" | vim -R -' @@ -25,6 +32,8 @@ alias gc='git commit -v' alias gca='git commit -v -a' alias gb='git branch' alias gba='git branch -a' +alias gdb='git branch -d' +alias gcount='git shortlog -sn' alias history='fc -l 1' -- cgit v1.2.3-70-g09d2 From b6c8ef41b1b8ed129f473377d4b8d549fa93b5b9 Mon Sep 17 00:00:00 2001 From: James Salter Date: Tue, 13 Oct 2009 12:34:53 +1100 Subject: added gcp alias (git cherry-pick) --- lib/aliases.zsh | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 273bcc679..f7d622149 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -34,6 +34,7 @@ alias gb='git branch' alias gba='git branch -a' alias gdb='git branch -d' alias gcount='git shortlog -sn' +alias gcp='git cherry-pick' alias history='fc -l 1' -- cgit v1.2.3-70-g09d2 From c03aab51645fa7448f4e92b09ab00e2de989010e Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Mon, 12 Oct 2009 19:13:52 -0700 Subject: Renaming script/server --debug alias to ssd to avoid conflict. Closes #1 --- lib/aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/aliases.zsh b/lib/aliases.zsh index f7d622149..304bafd27 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -3,7 +3,7 @@ alias po='popd' alias sc='ruby script/console' alias sdb='ruby script/dbconsole' -alias sd='ruby script/server --debugger' +alias ssd='ruby script/server --debugger' alias ss='thin --stats "/thin/stats" start' alias sg='ruby script/generate' alias sd='ruby script/destroy' -- cgit v1.2.3-70-g09d2