Caio Romão
a3c2a2f6e8
Add branch status support to git_prompt_status
...
This patch makes git_prompt_status support three new status variables:
- ZSH_THEME_GIT_PROMPT_AHEAD
- ZSH_THEME_GIT_PROMPT_BEHIND
- ZSH_THEME_GIT_PROMPT_DIVERGED
With these extra variables it's easy to see (1) if you have commits in
your local branch that weren't pushed to the remote (AHEAD), (2) if
there are commits in the remote that you haven't merged/rebased yet
(BEHIND) or (3) if you have local unpushed commits AND the remote has
some commits you haven't merged yet (DIVERGED).
Refer to the first line displayed on `git status -b --porcelain`.
An example setup in a .zsh-theme file would be:
ZSH_THEME_GIT_PROMPT_AHEAD="↑"
ZSH_THEME_GIT_PROMPT_BEHIND="↓"
ZSH_THEME_GIT_PROMPT_DIVERGED="↕"
2012-07-29 20:18:26 +02:00
Robby Russell
e8d582aba9
Merge pull request #977 from scialex/better-d
...
Make the 'd' alias only show the directories that can be cd'd to using the number aliases.
2012-06-13 13:25:00 -07:00
Robby Russell
38d537f9e7
Merge pull request #984 from vmalloc/less_r_pager
...
Pager is 'less -R' to support colored outputs
2012-06-13 13:22:33 -07:00
Robby Russell
f60244f8f4
Merge pull request #999 from ChaosData/master
...
Auto title now disabled in emacs term mode
2012-06-13 13:20:42 -07:00
Robby Russell
e6c81a5893
Merge pull request #1019 from matschaffer/patch-1
...
Don't clobber standard Esc+. behavior
2012-06-13 13:09:45 -07:00
s3
1bb715965c
Change hardcoded ~/.oh-my-zsh to $ZSH.
2012-06-12 10:18:02 +02:00
Mat Schaffer
5f72c63136
Don't clobber standard Esc+. behavior
...
Esc+. works as "last arg" on both bash and zsh. Seems like a shame to introduce a new standard.
2012-03-17 22:03:01 -03:00
Jeffrey Dileo
c7105a5341
Disabled title function for emacs term mode
2012-03-07 07:47:34 -05:00
Rotem Yaari
19bf83e17d
Pager is 'less -R' to support colored outputs
2012-03-01 10:27:19 +02:00
Alex Light
d693711f14
made the 'd' alias only show the directories that can be cd'ed to using the number aliases
2012-02-28 13:52:57 -05:00
cruser42
5a5c93b334
Fixed bug introduced when fixing issue 896
2012-02-21 10:47:05 -05:00
Aleksey Orekhov
a9f6aed307
fixed introduced to parse_git_dirty
2012-02-08 15:30:58 -05:00
Aleksey Orekhov
7ea758834b
changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate
2012-02-08 15:25:12 -05:00
Aleksey Orekhov
dc4d7a92c1
fixed asterisk display for modified repos in git prior to 1.7.2
2012-02-08 15:19:12 -05:00
Carlos Rodriguez
8769e5f8c9
Removed trailing spaces in Git files. Fixes #867
2012-01-26 23:19:50 -08:00
Gustavo Barron
cb501645d7
Get the Hostname
...
Main library should use ZSH native hostname function
2011-12-30 12:11:41 -06:00
Robby Russell
b29602e661
Merge pull request #764 from Fl4t/submodules
...
Ignore submodules dirty in prompt info
2011-12-26 10:05:51 -08:00
Robby Russell
2b86624951
Merge pull request #772 from indrajitr/master
...
Fix upgrade and uninstall functions to pick up $ZSH value
2011-12-26 10:04:59 -08:00
Indrajit Raychaudhuri
0b583638ae
Fix upgrade and uninstall functions to pick up $ZSH value
2011-12-25 19:53:55 +05:30
Kyle Smith
d8521693f4
Added support for entries in /etc/ssh/ssh_known_hosts.
2011-12-22 14:02:01 -05:00
julien@macbook
dd14e075b7
Ignore submodules dirty in prompt info
2011-12-21 15:03:55 +01:00
Robby Russell
d1b6423f2f
Merge pull request #732 from ggustafsson/patch-1
...
Removed duplicate setting and sorted the remaining
2011-12-14 21:59:37 -08:00
Göran Gustafsson
3fc812afc9
Removed duplicate setting and sorted the remaining
2011-12-03 13:18:37 +01:00
Christian Höltje
40c47a7375
lib/termsupport now uses add-zsh-hook
...
This is needed to play nice with plugins that need various hooks.
2011-11-15 01:14:03 -05:00
Robby Russell
762b55bb2b
Merge pull request #490 from hwti/428f18cf428fd86bd6e99c4363e5f25d0e392506
...
Add key bindings for gnome-terminal on Fedora
2011-08-30 21:09:36 -07:00
Robby Russell
9d67d75b0a
Revert "Enable red dots during completion by default".
...
After a few weeks of using this, I'd prefer this to not be enabled by default. My bad for suggesting that in the first place.
This reverts commit fc49b4a4de
2011-08-30 20:56:13 -07:00
Robby Russell
be2ab22694
Merge pull request #492 from hwti/red-dots-completion
...
Display red dots during completion process (disabled by default)
2011-08-11 05:51:03 -07:00
Robby Russell
a738ca9b64
Merge pull request #464 from bkonkle/patch-1
...
Minor corrections to deletion detection in git_prompt_status
2011-07-30 18:08:54 -07:00
Loïc Yhuel
fc49b4a4de
Enable red dots during completion by default
2011-07-28 19:52:53 +02:00
Loïc Yhuel
0848acfb25
Display red dots during completion process (disabled by default)
2011-07-24 21:48:21 +02:00
Loïc Yhuel
428f18cf42
Add key bindings for gnome-terminal on Fedora
2011-07-23 23:09:03 +02:00
Robby Russell
46440e7198
Merge pull request #208 from sorin-ionescu/plugin-extract
...
extract plugin
2011-07-23 09:33:42 -07:00
Robby Russell
5e4d89385f
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
2011-07-23 09:13:57 -07:00
Sven Lito
eb63ddf6bb
added mac keybinding for backward-delete-char
2011-07-23 09:11:08 -07:00
Robby Russell
ae9457d84d
Merge pull request #487 from dreur/upstream-spectrum-utility
...
Add utility method to spectrum
2011-07-23 08:58:10 -07:00
hobbestigrou
34f00f385c
More generic.
2011-07-23 08:54:47 -07:00
Benjamin Boudreau
cbaa97d8c3
Add utility method to spectrum
2011-07-23 11:09:45 -04:00
Christopher Sexton
a38774c98d
C-x C-e to edit current command in EDITOR
...
The command C-x C-e opens the current command line for editing
in the editor defined by the $EDITOR environment variable.
Thanks to Craig Bosma and his blog post about this:
http://distrustsimplicity.net/articles/zsh-command-editing
2011-07-18 09:54:59 -04:00
Brandon Konkle
6774fb3d59
Minor corrections to deletion detection in git_prompt_status
2011-07-13 23:23:01 -07:00
Sorin Ionescu
1db6575f14
Added extract plugin.
2011-06-01 20:33:16 -04:00
Michael Hanson
c014dca141
Fix deleted in git.zsh
2011-05-31 15:59:38 -07:00
Robby Russell
a81b0171cc
Merge pull request #196 from asymmetric/master
...
Add missing flag to unrar
2011-05-26 01:13:18 -07:00
Robby Russell
d275440219
Merge pull request #290 from arthurkalm/delete-key-working
...
Make the delete key work correctly, instead of outputting a ~
2011-05-13 02:52:25 -07:00
Robby Russell
4f71818a8b
Merge pull request #329 from juanghurtado/master
...
Support for $(current_branch) on git_parse_ahead()
2011-05-13 02:48:50 -07: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
Renaud (Nel) Morvan
e3cede37a0
Relax pattern matching on TERM. Closes #320 .
2011-05-02 13:51:16 +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
Pat Regan
655e6e8df0
Merge remote branch 'upstream/master'
...
Conflicts:
plugins/github/github.plugin.zsh
2011-04-20 01:29:58 -04:00
Arthur Kalmenson
7d9628b2dc
Added bindings for Gnome terminal.
2011-04-19 22:40:46 -04:00
Arthur Kalmenson
c7c959de60
Make the delete key work correctly, instead of outputting a ~
2011-04-19 19:01:18 -04:00
