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
Dan Nguyen
00558b8de8
fix substring indexing
10 years ago
Dan Nguyen
0231552c4e
use bash substring rather than cut
10 years ago
Dan Nguyen
7f63c3b0c7
Fix a problem calculating clean in the python script
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
Martin Gondermann
b46a233a05
Update git-prompt-help.sh
...
relates to #151
10 years ago
Martin Gondermann
4a993d8735
Makes merge conflicts clearer
...
fixes #151
10 years ago
Martin Gondermann
ffc9aa66bb
Merge pull request #167 from tuxinaut/master
...
Remove trailing whitespaces in the TruncatedPwd_WindowTitle theme
10 years ago
Martin Gondermann
e020b1a9c2
Merge pull request #166 from ogr3/new-theme
...
New theme
10 years ago
oGre
ee959b7e59
Remove training whitespace
10 years ago
Denny Schäfer
6d67d0c3d9
Remove trailing whitespaces in the TruncatedPwd_WindowTitle theme
10 years ago
oGre
168d33c3ab
Fixed name everywhere and documentation
10 years ago
oGre
abcc68b2f7
Added NoExitState version of my TruncatedPwd theme
10 years ago
Martin Gondermann
e74cae34b8
Merge pull request #161 from ogr3/is_function
...
Custom theme using prompt_callback
10 years ago
oGre
bc806a254a
Fixed documentation
10 years ago
oGre
b3194732a0
Custom theme using prompt_callback
10 years ago
Martin Gondermann
aba5c4e12f
Merge pull request #159 from ogr3/upstream2
...
Check if prompt_callback is a function must occur after theme has loaded.
Fixes #156
10 years ago
Martin Gondermann
7aff69ee5d
Merge pull request #160 from ogr3/upstream
...
Fixed typo in echoed text
10 years ago
oGre
31f690f65c
Check if prompt_callback is a function must occur after theme has loaded if theme is to override prompt_callback
10 years ago
oGre
8a04c7c260
Fixed typo in echoed text
10 years ago
Martin Gondermann
01f83ee94a
Adds new theme by @chmike . Fixes #152
10 years ago
Martin Gondermann
fd235fce66
Merge pull request #154 from chandrasing/master
...
[Local Branch Indicator] Change case from No upstream to no upstream
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