4a993d8735
Makes merge conflicts clearer
...
fixes #151
10 years ago
ffc9aa66bb
Merge pull request #167 from tuxinaut/master
...
Remove trailing whitespaces in the TruncatedPwd_WindowTitle theme
10 years ago
e020b1a9c2
Merge pull request #166 from ogr3/new-theme
...
New theme
10 years ago
ee959b7e59
Remove training whitespace
10 years ago
6d67d0c3d9
Remove trailing whitespaces in the TruncatedPwd_WindowTitle theme
10 years ago
168d33c3ab
Fixed name everywhere and documentation
10 years ago
abcc68b2f7
Added NoExitState version of my TruncatedPwd theme
10 years ago
df40c38f26
re-indented replaceSymbols function containing tab stops
10 years ago
ffe831d659
Missed two functions
10 years ago
554f14bf23
Re-indented functions. Added unset of prompt_callback when calling reset prompt. Call reset prompt when loading new theme. Added quicker check for function type.
10 years ago
e74cae34b8
Merge pull request #161 from ogr3/is_function
...
Custom theme using prompt_callback
10 years ago
bc806a254a
Fixed documentation
10 years ago
b3194732a0
Custom theme using prompt_callback
10 years ago
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
7aff69ee5d
Merge pull request #160 from ogr3/upstream
...
Fixed typo in echoed text
10 years ago
31f690f65c
Check if prompt_callback is a function must occur after theme has loaded if theme is to override prompt_callback
10 years ago
8a04c7c260
Fixed typo in echoed text
10 years ago
01f83ee94a
Adds new theme by @chmike . Fixes #152
10 years ago
fd235fce66
Merge pull request #154 from chandrasing/master
...
[Local Branch Indicator] Change case from No upstream to no upstream
10 years ago
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
d054b3a9a3
Added Gitter, removed Gittip
10 years ago
2bcaa46278
Merge pull request #148 from Adron/master
...
Extremelly minor change to installation README.md for OS-X.
10 years ago
ac88ad4757
Extremelly minor change to installation README.md for OS-X.
10 years ago
d85e946ee1
Merge branch 'master' of github.com:magicmonty/bash-git-prompt
...
# By corbosman
# Via Martin Gondermann (1) and corbosman (1)
* 'master' of github.com:magicmonty/bash-git-prompt:
fix match for theme
10 years ago
798667a7d5
GIT_PROMPT_FETCH_TIMEOUT in .bashrc isn't be ignored anymore
...
Fixes #121
10 years ago
4204a33bf3
Merge pull request #145 from corbosman/master
...
fix match for theme
10 years ago
a550921e75
Revert "Simplify branch name extraction"
...
This reverts commit fff05011c0Fixes #146
10 years ago
e72fd9a41b
fix match for theme
11 years ago
281309a7b1
Revert "Delete gitstatus.py"
...
This reverts commit 79de7691c7
11 years ago
2a6b20cd8e
Merge pull request #142 from rgolangh/simplified_branchname
...
Simplify branch name extraction
11 years ago
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
c49043ea3e
Merge pull request #136 from hugosato/master
...
Help strings should use the themed variables
11 years ago
1b78c38797
Merge pull request #139 from apeyser/spec
...
Spec file tried to include non-existent python files
11 years ago
b978537c35
Merge pull request #137 from rkitover/master
...
Fix Solaris compatibility
11 years ago
16b55272c4
Spec file tried to include non-existent python files
11 years ago
9f91317c7c
Fix Solaris compatibility
...
Add a workaround for the lack of -mmin in Solarises find, check for
gfind from opencsw and failing that use perl, which Solaris ships with
and is widely available on many other systems.
If neither a working find nor perl is available, print a warning and
turn off remote status checking.
Use eval in async_run to run the command, the old bash in Solaris 5.10
does not recognize the previous syntax.
Use command -v instead of which to check for the existance of rbenv in
the Crunch and Solarized_Extravagant themes. command -v is the POSIX-ly
correct way to check for the existance of a command, and which does not
set the exit code on Solaris.
11 years ago
c1e0d50952
Help strings should use the themed variables
11 years ago
79de7691c7
Delete gitstatus.py
...
See #134 , as the Python script is not supported anymore
11 years ago
cf4971a868
The README contained a reference to the deprecated Python script
...
Fixes #134
11 years ago
a9c6ae0f3b
Merge pull request #133 from darlingm/master
...
get_prompt_help() failed sourcing themes/Default.bgptheme,
11 years ago
39f94dd555
get_prompt_help() failed sourcing themes/Default.bgptheme, unless called from the bash-git-prompt directory. Fixed by adding "{__GIT_PROMPT_DIR}/".
11 years ago
65a70865d9
Merge pull request #129 from krazedkrish/master
...
Added some more themes.
11 years ago
da368f4849
Solarized_Extravagant theme gets ssh aware
...
Solarized_Extravagant theme shows different symbol in prompt
if the user has logged in through ssh
11 years ago
0a75bb8461
Added Solarized_Extravagant theme
11 years ago
93bd09c4cd
Added Single_line_Solarized theme
11 years ago
37b2001fc1
Added oh-my-zsh's crunch like theme
11 years ago
45dce86788
Merge pull request #127 from meermanr/master
...
_LAST_COMMAND_INDICATOR_ now displays symbolic names of signals
11 years ago
7ca0026b37
_LAST_COMMAND_INDICATOR_ now displays symbolic names of signals
11 years ago
826eef2c84
Merge pull request #126 from reddshack/master
...
use double quotes to handle path with spaces
11 years ago
5762652b25
use double quotes to handle path with spaces
11 years ago
Martin Gondermann
oGre
Denny Schäfer
Martin Gondermann
Chandrasing
Adron Hall
corbosman
Roy Golan
Alexander Peyser
Rafael Kitover
Hugo Sato
Michael Darling
krazedkrish
Robert Meerman
Brent Redd