oGre
ca7a848ca4
Renamed array variable to _fields to comply with the other arrays
10 years ago
ogr3
ed44f6bc9d
Merge pull request #1 from pedantic79/simple-dots-fix
...
Simple dots fix
10 years ago
Dan Nguyen
dedb19180b
fix issue with parsing ahead/behind
10 years ago
Dan Nguyen
fc6d4d87e7
Merge remote-tracking branch 'ogr3/dots-fix' into simple-dots-fix
...
* ogr3/dots-fix:
Possible to have dots in branch name
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
5098924db8
Merge pull request #177 from ogr3/theme-optimized
...
Theme listing optimized using bash parameter substitution
10 years ago
oGre
f1940dfe8b
Quoted paths to handle spaces in them
10 years ago
oGre
f319f3acc1
Added break in loop after we find the current theme
10 years ago
oGre
2e0180f93a
Removed backtick from comment
10 years ago
oGre
09fcaf22fc
Optimized theme reading to not use external commands, but only bash
10 years ago
Martin Gondermann
1952c2c86c
Merge pull request #162 from ogr3/theme-fix
...
Re-indented functions. Added faster check for function type.
10 years ago
oGre
c6b12da650
Merge branch 'theme-fix' of github.com:ogr3/bash-git-prompt into theme-fix
10 years ago
oGre
249c24e279
Two functions missed.
10 years ago
oGre
8cd60a61da
Merge branch 'master' of https://github.com/magicmonty/bash-git-prompt into theme-fix
10 years ago
Martin Gondermann
1603b30f71
Fixes error on freshly initialized repository
10 years ago
Martin Gondermann
1b31e33d93
Merge pull request #176 from pedantic79/porcelain
...
Remove calling wc to count lines.
10 years ago
Dan Nguyen
e10ecb4139
Merge branch 'porcelain-no-wc' into porcelain
...
* porcelain-no-wc:
Remove use of wc
10 years ago
Martin Gondermann
4054bff03d
Merge pull request #170 from pedantic79/porcelain
...
Use `git status --porcelain --branch` to improve performance
10 years ago
Dan Nguyen
1786764bc1
Remove use of wc
10 years ago
pedantic79
5293850880
Merge pull request #9 from ogr3/porcelain-sed
...
Removed sed and cut
10 years ago
oGre
89acb1c4b0
Changed to match tabs and spaces
10 years ago
oGre
c279c77fd8
Resolved conflict
10 years ago
pedantic79
5cbd877fe5
Merge pull request #7 from ogr3/porcelain-tag
...
Fixed bug in stash parsing
10 years ago
oGre
5fe390d098
Fixed bug in stash parsing
10 years ago
pedantic79
a2906f4411
Merge pull request #6 from ogr3/porcelain-tag
...
We set branch first, then remote
10 years ago
oGre
3621b5a67c
We set branch first, then remote
10 years ago
pedantic79
5b82a33b4f
Merge pull request #5 from ogr3/porcelain-tag
...
Able to parse tag names when on tag
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
pedantic79
589106d420
Merge pull request #4 from ogr3/porcelain-no-remote
...
Check for local branch needs to be moved so that check for behind/aft…
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
b50cc5cb0d
Merge remote-tracking branch 'ogr3/porcelain-cleanup' into porcelain
...
* ogr3/porcelain-cleanup:
Missed one
Changed all backticks to
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
0e6b70f8e3
Merge branch 'porcelain-remove-grep' into porcelain
...
* porcelain-remove-grep:
Fix parsing when both ahead and behind
Fix behind parsing
Use printf instead of echo to display
Fix handling of stash
Switch case matches from * to ?
Remove calls to grep/egrep
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
b9d720905c
Merge branch 'wkentaro-set-lc-all-to-in-english' into porcelain
...
* wkentaro-set-lc-all-to-in-english:
Set LC_ALL=C at git status to make sure in English
10 years ago
Dan Nguyen
7418da801d
Set LC_ALL=C to force branch output to English
10 years ago
Kentaro Wada
0dbac24bba
Set LC_ALL=C at git status to make sure in English
...
Fix https://github.com/magicmonty/bash-git-prompt/pull/170#issuecomment-142516122
10 years ago
oGre
d83795adcb
Revert unset prompt_callback and extra call to git_prompt_reset
10 years ago