Matt Smiley
bc0f8bd83f
When working from a detached head that has an associated tag, show that tag instead of the short SHA1 hash, even if it is unannotated.
10 years ago
oGre
5182ee9d35
check num_conflicts against 0
10 years ago
Aurélien Rainone
0590b8740d
Take num_conflicts into account for 'clean' flag
10 years ago
Martin Gondermann
410fd059a7
GIT_PROMPT_SHOW_UNTRACKED_FILES=no was not working correctly
...
* Fixed the bug, than GIT_SHOW_UNTRACKED_FILES=no was not respected
* Renamed GIT_SHOW_UNTRACKED_FILES to GIT_PROMPT_SHOW_UNTRACKED_FILES as
this is more consistent to the other environment variables
* GIT_PROMPT_SHOW_UNTRACKED_FILES can be now also set on a per
repository basis in .bash-git-rc
* Updated README
Fixes #215 and 216
10 years ago
Arne Schmitz
4f2bc5cadf
add env variable for showing of untracked files
10 years ago
Joni Lahtinen
c6e9984135
Use portable shebang
10 years ago
oGre
67e7d6a08b
Fixed bug where not all untracked files in folders were shown
10 years ago
oGre
54543440f5
Add upstream tracked branch to gitstatus.sh and possible to show in prompt
10 years ago
oGre
ca7a848ca4
Renamed array variable to _fields to comply with the other arrays
10 years ago
Dan Nguyen
dedb19180b
fix issue with parsing ahead/behind
10 years ago
Dan Nguyen
73f3cb75d1
Handle branches with dots in them
10 years ago
oGre
d4b630bf7d
Possible to have dots in branch name
10 years ago
Martin Gondermann
1603b30f71
Fixes error on freshly initialized repository
10 years ago
Dan Nguyen
1786764bc1
Remove use of wc
10 years ago
oGre
89acb1c4b0
Changed to match tabs and spaces
10 years ago
oGre
c279c77fd8
Resolved conflict
10 years ago
oGre
5fe390d098
Fixed bug in stash parsing
10 years ago
oGre
3621b5a67c
We set branch first, then remote
10 years ago
oGre
c5cac48f4d
Initial commit on is always a local state - set no remote tracking
10 years ago
oGre
b989b7f324
Able to parse tag names when on tag
10 years ago
oGre
9955edb5c3
Check for local branch needs to be moved so that check for behind/after doesn't override the result
10 years ago
Dan Nguyen
db6f219553
Reorder AHEAD and BEHIND
10 years ago
oGre
87c66ea8d1
Missed one
10 years ago
Dan Nguyen
0e48e020b8
Remove unnecessary grep line
10 years ago
oGre
750425d841
Changed all backticks to
10 years ago
Dan Nguyen
220d5c22b1
Fix parsing when both ahead and behind
10 years ago
Dan Nguyen
606388df39
Fix behind parsing
10 years ago
Dan Nguyen
01f5402c77
Fix behind parsing
10 years ago
Dan Nguyen
545cdce399
Use printf instead of echo to display
10 years ago
Dan Nguyen
ff7aa3aa7a
Fix handling of stash
10 years ago
Dan Nguyen
1e2ff37282
Switch case matches from * to ?
10 years ago
Dan Nguyen
e4c6b0ab9e
Remove calls to grep/egrep
10 years ago
Dan Nguyen
3a9239d227
Fix issue where _NO_REMOTE_TRACKING_ doesn't show up when there is no remote branch
10 years ago
Dan Nguyen
7418da801d
Set LC_ALL=C to force branch output to English
10 years ago
Dan Nguyen
00558b8de8
fix substring indexing
10 years ago
Dan Nguyen
0231552c4e
use bash substring rather than cut
10 years ago
Dan Nguyen
8e9faff949
Fix issue parsing where there is no remote branch
10 years ago
Dan Nguyen
54162e71d0
Use `git status --porcelain --branch` to improve performance
...
Based off of changes by @wkentaro to zsh-git-prompt
see: https://github.com/olivierverdier/zsh-git-prompt/pull/65
10 years ago
Chandrasing
90f1cd2f01
[Local Branch Indicator] Change case from No upstream to no upstream
...
This commit fixes the Local Indicator which was broken because of theme related changes.
10 years ago
Martin Gondermann
a550921e75
Revert "Simplify branch name extraction"
...
This reverts commit fff05011c0 .
Fixes #146
10 years ago
Roy Golan
fff05011c0
Simplify branch name extraction
...
Use symbolic-ref --short to get the branch name without the refs/heads
Signed-off-by: Roy Golan <rgolan@redhat.com>
11 years ago
scrawl
4083a4b8d7
Show all untracked files in the repository instead of just from ./ on.
11 years ago
Martin Gondermann
c0510cf2fa
GIT_PROMPT_IGNORE_STASH was broken. Fixes #106
11 years ago
Tobias Schottdorf
d81ea1d3a8
replace `git status` by `git ls-files ...` to avoid touching .git
11 years ago
Martin Gondermann
f993391f2f
Revert ".git was being touched continuously"
...
This reverts commit 7855e77e40 .
11 years ago
Martin Gondermann
7855e77e40
.git was being touched continuously
...
Fixes #97
11 years ago
Martin Gondermann
b745d72722
Optimized themes
11 years ago
Martin Gondermann
c04317996d
gitstatus.sh was not theme aware
...
fixes #83
11 years ago
Matias Fernandez
877d1c2e81
Modify gitstatus.sh to detect local branch without tracking remote
12 years ago
Martin Gondermann
4153ec7ed7
Made gitstatus variables for `symbols_ahead`, `symbols_behind` and `symbols_prehash` configurable via `git-prompt-colors.sh`
...
Fixes #51
The new variables are:
```bash
GIT_STATUS_SYMBOLS_AHEAD
GIT_STATUS_SYMBOLS_BEHIND
GIT_STATUS_SYMBOLS_PREHASH
```
12 years ago