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
Vitaly Zdanevich
1b7e80afa5
simplify section about installation
10 years ago
Nimit Kalra
09aa43a637
Add year and name to license.
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
Martin Gondermann
2d9ec22dd2
Merge pull request #214 from root42/untracked-files
...
Make counting ALL untracked files optional
10 years ago
Arne Schmitz
aa0b32fdb5
add documentation for GIT_SHOW_UNTRACKED_FILES
10 years ago
Arne Schmitz
4f2bc5cadf
add env variable for showing of untracked files
10 years ago
Martin Gondermann
6a606da7c0
Merge pull request #210 from ogr3/single-line-themes-simplified
...
Changed the themes to properly override Default theme
10 years ago
Martin Gondermann
02f8c1029c
Merge pull request #211 from ogr3/remove-unused-vars
...
Removed unused variables
10 years ago
oGre
4ab6a6f2fe
Removed unused variables
10 years ago
oGre
a2182bb646
Fix for terminal fonts
10 years ago
oGre
d3785812bb
Single_line_Solarized simplified
10 years ago
oGre
a3ea748972
Simplified Single_line and Single_line_Ubuntu themes to override Default
10 years ago
Martin Gondermann
d7ccfe7aee
Merge pull request #208 from ogr3/test-handle-empty-string
...
Change test to accept empty string as set
10 years ago
oGre
d4564b29bf
Changed themes to use empty string, which couldn't be done before.
10 years ago
oGre
3740531995
Use test -z, but handle empty string in variable as set
10 years ago
Jernej Tonejc
69188e5d0d
fix escapes for terminal title
10 years ago
Martin Gondermann
ac354161b6
Merge pull request #205 from keras/magicmaster
...
Use `test -v` to allow overriding defaults with empty strings
10 years ago
mikael
f9340cee17
use `test -v` to allow overriding defaults with empty strings
10 years ago
Martin Gondermann
c673ea84cf
Merge pull request #204 from ogr3/shebang-line
...
Added portable shebang line
10 years ago
oGre
16d7bf93ad
Removed old comments
10 years ago
oGre
e0769122da
Added shebang line
10 years ago
Martin Gondermann
40f2d1b1ce
Merge pull request #201 from ogr3/ubuntu-themes-cleanup
...
Tweaked Ubuntu versions of fonts to only override the symbols from De…
10 years ago
Martin Gondermann
c2fa630f1b
Merge pull request #198 from asazello/master
...
A space was missing.
10 years ago
Martin Gondermann
cb267fca65
Merge pull request #197 from ogr3/single-lite-theme-fix
...
Themes overriding define_undefined_git_prompt_colors needs the new variables
10 years ago
Martin Gondermann
61606eb5f9
Merge pull request #196 from ogr3/simplified-old-status
...
Simplified old gitstatus
10 years ago
oGre
57279738f1
Tweaked Ubuntu versions of fonts to only override the symbols from Default that are needed. Added Ubuntu versions of the TruncatedPwd_WindowTitle theme.
10 years ago
Asazello
eb8e281667
A space was missing.
10 years ago
oGre
7ee135e1de
Themes overriding define_undefined_git_prompt_colors needs the new variables
10 years ago
oGre
8894a5f84a
Simplified old gitstatus, eliminating a git command if no upstream branch is found
10 years ago
Martin Gondermann
21992de10b
Merge pull request #195 from ogr3/themes-cleanup
...
Cleanup of themes, adding the new upstream variables where applicable
10 years ago
Martin Gondermann
33c56e492b
Merge pull request #194 from ogr3/old-gitstatus-bugfix
...
Bugfix - reverted command to check if in repo and extract branch. Now…
10 years ago
Martin Gondermann
86a92caa1c
Merge pull request #193 from asazello/master
...
Fix for Single_line_Ubuntu.bgptheme
10 years ago
oGre
62496416cd
Cleanup of themes, adding the new upstream variables where applicable
10 years ago
oGre
8ac89e8e26
Bugfix - reverted command to check if in repo and extract branch. Now works for tags and commit checkouts
10 years ago
Asazello
d431610689
Fix for Single_line_Ubuntu.bgptheme
10 years ago
Martin Gondermann
12e4de13bb
Merge pull request #190 from hiukkanen/master
...
Use portable shebang
10 years ago
Martin Gondermann
22d5591af4
Merge pull request #192 from ogr3/environment-fix
...
Let GIT_PROMPT_STATUS_COMMAND be set before loading prompt
10 years ago
oGre
f0dea79027
Updated documentation. Let GIT_PROMPT_STATUS_COMMAND be set outside a theme before loading gitprompt.sh
10 years ago
Joni Lahtinen
c6e9984135
Use portable shebang
10 years ago