Sven Lito
71804d4292
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
...
Conflicts:
tools/upgrade.sh
2011-06-06 12:11:49 +02:00
Michael Hanson
c014dca141
Fix deleted in git.zsh
2011-05-31 15:59:38 -07:00
Sven Lito
1954b5550e
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
...
Conflicts:
lib/key-bindings.zsh
plugins/git-flow/git-flow.plugin.zsh
plugins/github/github.plugin.zsh
tools/check_for_upgrade.sh
2011-05-14 11:23:30 +01:00
Juan G. Hurtado
e129fc5a28
Adds support for $(current_branch) on git_parse_ahead()
...
Changes method git_parse_ahead() on git.zsh lib file. Before this
change it checked directly against origin/master branch. Now it
uses $(current_branch) to check for not pushed changes against
the current remote branch.
2011-05-09 13:32:42 +02:00
Juan G. Hurtado
077baa7bb1
Adds new prompt methods on Git lib
...
Modifies the Git lib file (lib/git.zsh), adding three new prompt
methods:
- git_prompt_ahead(): Shows the content of the custom var
$ZSH_THEME_GIT_PROMPT_AHEAD if the local repository has
commits ahead from the remote origin repository
- git_prompt_short_sha(): Shows last commit SHA hash in short
mode wrapped between the content of the custom vars
$ZSH_THEME_GIT_PROMPT_SHA_BEFORE and
$ZSH_THEME_GIT_PROMPT_SHA_AFTER
- git_prompt_long_sha(): Shows last commit SHA hash in long
mode wrapped between the content of the custom vars
$ZSH_THEME_GIT_PROMPT_SHA_BEFORE and
$ZSH_THEME_GIT_PROMPT_SHA_AFTER
2011-04-29 09:22:56 +02:00
Sven Lito
e0ca1b0f68
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
...
Conflicts:
.gitignore
lib/directories.zsh
lib/termsupport.zsh
lib/theme-and-appearance.zsh
oh-my-zsh.sh
plugins/git/git.plugin.zsh
plugins/osx/osx.plugin.zsh
2011-04-16 13:20:58 +01:00
Sorin Ionescu
90a9a5f251
Added modified while newly added and type change detection to git prompt modified status.
2011-02-03 23:24:33 -05:00
Mike Prentice
bcad29faf4
changed git symbolic-ref to git rev-parse in lib/git
2010-10-11 09:35:10 +08:00
Sven Lito
dc12853b0c
merging in changes from robby's repo
2010-10-09 19:11:07 +01:00
Irakli Gozalishvili
8059c0727a
Improving git plugin so it can display much more data.
2010-10-09 01:48:23 +02:00
Robby Russell
27904c117c
Moving current_branch() to git plugin
2010-06-03 12:56:11 -07:00
Robby Russell
3cf9ab722e
Initial implementation of a new plugin system, so that people can managed which aliases/functions they want.
2010-06-03 12:03:26 -07:00
Andy Fowler
3c87d48362
makes git status prompt 4x faster
...
(via git status -s, benchmarked)
2010-05-06 20:37:00 -07:00
Martin Klepsch
f9509f365b
Putting Git related aliases into git.zsh to have them in context.
2009-12-27 21:19:40 -08:00
Robby Russell
473dd3b212
Adding current_branch function, which can be used like: git pull origin master
2009-11-25 12:45:16 -08:00
Toon Claes
147f1dc702
Modifying changes for issue 25, to fix issue 27
2009-11-09 21:38:40 +01:00
Toon Claes
729fd0ab3c
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
2009-11-09 21:28:17 +01:00
meh
8f33231823
Fixed issue #25 .
2009-11-09 07:15:06 +08:00
Toon Claes
e2dba2c3e9
Joined the appearance so the theme can apply LSCOLORS too
2009-11-04 20:37:18 +01:00
Robby Russell
8debd097fb
Moving all zsh config options into a lib/ subdirectory to make way for some upcoming changes to directory structure and configuration options
2009-09-23 07:43:36 -07:00
