hgmoll
|
1dc7dbafa0
|
Fix bash-git-prompt's gitstatus.sh
A file can be staged AND unstaged at the same time
|
10 years ago |
Martin Gondermann
|
85a2752f71
|
Merge pull request #263 from ksinkar/updated_rspec
Updating the SPEC file to reflect that current version
|
10 years ago |
Koustubh Sinkar
|
c5b8b0a352
|
Updating the SPEC file to reflect that current version
|
10 years ago |
Martin Gondermann
|
b2249ace8b
|
Merge branch 'thomasrebele-master'
|
10 years ago |
|
Martin Gondermann
|
8631c06c35
|
Merge branch 'master' of https://github.com/thomasrebele/bash-git-prompt into thomasrebele-master
|
10 years ago |
|
Martin Gondermann
|
0a7f739496
|
Updated Homebrew Formula
|
10 years ago |
|
Martin Gondermann
|
6b9bb1cac1
|
Merge pull request #260 from ogr3/colors-as-function
Extract color definition loading as a function
|
10 years ago |
oGre
|
46ab557cbc
|
Extract color definition loading as a function
|
10 years ago |
|
Martin Gondermann
|
0ee3ef866b
|
Merge pull request #257 from tessus/evermeet-themes
Evermeet theme
|
10 years ago |
Helmut K. C. Tessarek
|
720ac90861
|
add a slightly modified theme for lowres and non-retina screens
|
10 years ago |
|
Helmut K. C. Tessarek
|
2da8770cb1
|
add trailing spaces to 3 more symbols
|
10 years ago |
|
Helmut K. C. Tessarek
|
c1310f41bc
|
renamed: Evermeet_lowres_screens.bgptheme -> Evermeet_Ubuntu.bgptheme
|
10 years ago |
|
Helmut K. C. Tessarek
|
9d7cbb7870
|
replace escape sequences with color names
|
10 years ago |
|
Helmut K. C. Tessarek
|
bd2bd96135
|
make a few changes for low resolution displays (unicode characters may overlap with the following character)
|
10 years ago |
|
Helmut K. C. Tessarek
|
528a9ad8f7
|
add a new theme 'Evermeet'
|
10 years ago |
|
Martin Gondermann
|
a9d9a56120
|
Merge pull request #254 from ogr3/quote-fix
Quote fix
|
10 years ago |
|
oGre
|
9a6f9cbb3c
|
Revert both 'fixes'
|
10 years ago |
|
oGre
|
134be60f6f
|
Added IntelliJ project directory to .gitignore
|
10 years ago |
|
oGre
|
31ceb350fd
|
Fixed quoting to just around the first parameter
|
10 years ago |
|
Martin Gondermann
|
093734c86a
|
Merge pull request #253 from tiagocoutinho/master
Solves issue #252: error message in prompt with old bash version
|
10 years ago |
Jose Tiago Macara Coutinho
|
fd34847175
|
Solves issue #252: error message in prompt with old bash version
|
10 years ago |
|
Martin Gondermann
|
def903b6b3
|
Merge pull request #251 from gcbartlett/master
Fix repeated 'git_prompt_color_samples' bug
|
10 years ago |
Gary Bartlett
|
1b59e1e075
|
Update git-prompt-help.sh
Initialized local x to 0 (in case it is already set).
|
10 years ago |
|
Gary Bartlett
|
21e7426594
|
Made 'x' a local variable so the 'git_prompt_color_samples' command can be repeated.
|
10 years ago |
|
Martin Gondermann
|
ba19c4134d
|
Merge pull request #206 from jcrypto/master
fix escapes for terminal title
|
10 years ago |
|
Martin Gondermann
|
569574b279
|
Merge pull request #246 from jhalfmoon/fix/deletedcount-and-lastcommandcolor
fix deleted item count and fix last_command_indicator coloring
|
10 years ago |
Johnny Halfmoon
|
61cd6ae2ad
|
(1) Deleted items were incorrectly counted as staged. (2) A ResetColor string after the last_command_indicator makes the command line colors be a bit more predictable.
|
10 years ago |
Thomas Rebele
|
a9c93c906e
|
Merge remote-tracking branch 'origin/master'
|
10 years ago |
|
Martin Gondermann
|
b3f4d82842
|
Export GIT_BRANCH as environment variable for 3rd party usage, fixes #244
|
10 years ago |
|
Martin Gondermann
|
ac771746fd
|
Merge pull request #243 from rkitover/master
new theme Solarized_UserHost
|
10 years ago |
Rafael Kitover
|
699818475d
|
new theme Solarized_UserHost
This theme is based on Solarized_Extravagant, with the ruby prompt, date
and kernel version removed, and user@host added on the second line.
|
10 years ago |
|
Thomas Rebele
|
0ac3d048be
|
added option to specify path of template file
|
10 years ago |
|
Martin Gondermann
|
134219ea4b
|
Merge pull request #240 from ogr3/show-unannotated-tags-legacy-fix
Fixed typo
|
10 years ago |
|
Martin Gondermann
|
cca16cc260
|
git clone --depth=0 is invalid, Fixes #241
|
10 years ago |
|
oGre
|
2472c71408
|
Fixed typo
|
10 years ago |
|
Martin Gondermann
|
3fe5e519dc
|
Merge pull request #234 from mik-laj/patch-1
Download only latest version via git
|
10 years ago |
|
Martin Gondermann
|
4713858872
|
Merge pull request #239 from ogr3/show-unannotated-tags-legacy
Make pr#238 work for legacy git as well
|
10 years ago |
|
Martin Gondermann
|
a6d32f0d11
|
Merge pull request #238 from matt-smiley/master
Show an unannotated tag too
|
10 years ago |
|
oGre
|
d6acf1361c
|
Make pr#238 work for legacy git as well
|
10 years ago |
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 |
mik-laj
|
297b3b2fb3
|
Download only latest version via git
|
10 years ago |
|
Martin Gondermann
|
485d12adb3
|
Merge pull request #228 from ogr3/num-conflicts
check num_conflicts against 0
|
10 years ago |
|
oGre
|
5182ee9d35
|
check num_conflicts against 0
|
10 years ago |
|
Martin Gondermann
|
75e50b1649
|
Merge pull request #227 from aurelien-rainone/fix-conflicts-clean-flag
Take conflicts into account for 'clean' flag
|
10 years ago |
Aurélien Rainone
|
0590b8740d
|
Take num_conflicts into account for 'clean' flag
|
10 years ago |
|
Martin Gondermann
|
b1291e4561
|
Merge pull request #220 from positron/patch-1
Fix plurality in README
|
10 years ago |
Philip Jagielski
|
6a7a70f5eb
|
Fix plurality in README
Otherwise it would be more correct to say file(s) with merge conflict(s).
|
10 years ago |
|
Martin Gondermann
|
e3bf510317
|
Merge pull request #219 from vitaly-zdanevich/master
clarified section about installation
|
10 years ago |
|
Martin Gondermann
|
d2d82360cf
|
Merge pull request #217 from qw3rtman/fix-license
Add year and name to license.
|
10 years ago |
Vitaly Zdanevich
|
e290bb7123
|
Merge pull request #1 from vitaly-zdanevich/clarified-section-about-installation
simplify section about installation
|
10 years ago |
