summaryrefslogtreecommitdiff
path: root/lib/git.zsh
AgeCommit message (Collapse)Author
2013-06-12Fixed slow behavior when using GitHub wrappersTheodore Kokkoris
2013-05-19Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.Christopher Roach
2013-04-23Resolving conflict when merging in 1570Robby Russell
2013-04-23Merge pull request #1740 from felipec/fc/gitRobby Russell
git: fix parse_git_dirty()
2013-04-22Added option to allow untracked files as non dirtyJeremy Attali
In this commit, the option only works for git but it should not be to hard for someone who knows svn to so the same. This commit is largely inspired by @yoavweiss, I only added an option to use it.
2013-04-21git: fix parse_git_dirty()Felipe Contreras
If oh-my-zsh.hide-status is configured, the 'clean' code won't be generated, and some themes might end up distorted. Let's generate the 'clean' code even when we don't want the show the dirty status. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
2013-04-07Merge pull request #1654 from bertag/parse-git-dirty-support-for-1.6Robby Russell
parse_git_dirty() support for Git 1.6
2013-04-03This fixes checking for git untracked itemsChristian Höltje
The grep expression was incorrect for normal grep. Adding the `-E` option fixed the escaping of the question marks.
2013-03-26Merge pull request #1661 from hellerbarde/masterRobby Russell
Fix some problems with git enabled prompts where they *always* claim to have untracked files
2013-03-14fix git_prompt_status() to not say the repository has untracked files all ↵Philip Stark
the time
2013-03-11Tweaked parse_git_dirty() in lib/git.zsh to support proper dirty/clean ↵bertag
parsing against both git 1.6 and git 1.7+
2013-02-19pipe git version check error to /dev/null (for when git doesn't exist)Thomas Minor
2013-02-13Did a full circle and went back to # On branch masterYoav Weiss
# Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: git.zsh #, ignoring untracked files, which seems to be the primary cause for slowness
2013-02-13Fixed dirty check to include files added to indexYoav Weiss
2013-01-30Closer to original status command, using SUBMODULE SYNTAXYoav Weiss
2013-01-27Faster dirty git status check (using git diff)Yoav Weiss
2013-01-10Merge pull request #1077 from Mezzle/add-option-to-show-git-statusRobby Russell
Add option to disable status notification
2012-12-07Add Stash toogle to display if there's some stash or not in `git_prompt_status`MAD
2012-12-04Merge pull request #1258 from caio/git-branch-statusRobby Russell
Add branch status support to git_prompt_status
2012-12-04Merge pull request #875 from ttddyy/prompt_git-removeRobby Russell
prompt git-rm as deleted
2012-12-02Merge pull request #1263 from tedv/headless-gitRobby Russell
Make git use sha when branch name is missing.
2012-07-31Make git use sha when branch name is missing.Ted Vessenes
2012-07-29Add branch status support to git_prompt_statusCaio Romão
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-24MergeJames Smith
2012-04-18Add option to disable status notificationMartin Meredith
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-02-21Fixed bug introduced when fixing issue 896cruser42
2012-02-08fixed introduced to parse_git_dirtyAleksey Orekhov
2012-02-08changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurateAleksey Orekhov
2012-02-08fixed asterisk display for modified repos in git prior to 1.7.2Aleksey Orekhov
2012-01-26Removed trailing spaces in Git files. Fixes #867Carlos Rodriguez
2012-01-26prompt git-remove as deletedTadaya Tsuyukubo
2011-12-21Ignore submodules dirty in prompt infojulien@macbook
2011-08-01Merge in recent stuffJames Smith
2011-07-13Minor corrections to deletion detection in git_prompt_statusBrandon Konkle
2011-05-31Fix deleted in git.zshMichael Hanson
2011-05-09Adds support for $(current_branch) on git_parse_ahead()Juan G. Hurtado
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-04-29Adds new prompt methods on Git libJuan G. Hurtado
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-03-19Added new function git_remote_status to check if we are ahead, behind or ↵James Smith
diverged from the remote branch
2011-02-03Added modified while newly added and type change detection to git prompt ↵Sorin Ionescu
modified status.
2010-10-09merging in changes from robby's repoSven Lito
2010-10-09Improving git plugin so it can display much more data. Irakli Gozalishvili
2010-06-03Moving current_branch() to git pluginRobby Russell
2010-06-03Initial implementation of a new plugin system, so that people can managed ↵Robby Russell
which aliases/functions they want.
2010-05-06makes git status prompt 4x fasterAndy Fowler
(via git status -s, benchmarked)
2009-12-27Putting Git related aliases into git.zsh to have them in context.Martin Klepsch
2009-11-25Adding current_branch function, which can be used like: git pull origin masterRobby Russell
2009-11-09Modifying changes for issue 25, to fix issue 27Toon Claes
2009-11-09Merge branch 'master' of git://github.com/robbyrussell/oh-my-zshToon Claes
2009-11-09Fixed issue #25.meh
2009-11-04Joined the appearance so the theme can apply LSCOLORS tooToon Claes
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-02 23:47:05 +0000