dolysis
/
ohmyzsh
3
0
Fork 0
Code Issues Pull Requests Releases Activity
5,288 Commits 2 Branches 0 Tags 133 MiB
Commit Graph

85 Commits

Author SHA1 Message Date
Robby Russell 9ef7e8a191 Merge pull request #1077 from Mezzle/add-option-to-show-git-status 
Add option to disable status notification
 2013-01-10 22:36:16 -08:00
MAD b9a989fea5 Add Stash toogle to display if there's some stash or not in `git_prompt_status` 2012-12-07 10:25:02 +01:00
Robby Russell 78e3f38db7 Merge pull request #1258 from caio/git-branch-status 
Add branch status support to git_prompt_status
 2012-12-04 06:56:43 -08:00
Robby Russell 5aed0aed4e Merge pull request #875 from ttddyy/prompt_git-remove 
prompt git-rm as deleted
 2012-12-04 06:45:17 -08:00
Robby Russell 9977afc0b5 Merge pull request #1263 from tedv/headless-git 
Make git use sha when branch name is missing.
 2012-12-02 12:42:38 -08:00
Ted Vessenes 027fcccc92 Make git use sha when branch name is missing. 2012-07-31 13:27:40 -04:00
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
James Smith 772bc51c3a Merge 2012-07-24 13:39:07 -07:00
Martin Meredith 8ce35df2c5 Add option to disable status notification 
For certain git repositories, this slows down usage
of the shell horifically.

This option can be set with

    git config --add oh-my-zsh.hide-status 1

which will disable checking/showing the status notification
 2012-04-18 11:45:22 +01: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
Tadaya Tsuyukubo 52733cb3bb prompt git-remove as deleted 2012-01-26 15:20:08 -08:00
julien@macbook dd14e075b7 Ignore submodules dirty in prompt info 2011-12-21 15:03:55 +01:00
James Smith 0ba398f9e1 Merge in recent stuff 2011-08-01 00:44:51 -07:00
Brandon Konkle 6774fb3d59 Minor corrections to deletion detection in git_prompt_status 2011-07-13 23:23:01 -07:00
Michael Hanson c014dca141 Fix deleted in git.zsh 2011-05-31 15:59:38 -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
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
James Smith 2d5412e99b Added new function git_remote_status to check if we are ahead, behind or diverged from the remote branch 2011-03-19 17:50:24 -07: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
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
Renamed from git.zsh (Browse further)