Martin Gondermann
116e948f24
Merge pull request #404 from mrakitin/doc_update_config_instructions
...
DOC: update installation/configuration instructions
7 years ago
Maksim Rakitin
f8d4d3911b
DOC: update installation/configuration instructions
7 years ago
Martin Gondermann
9c07945385
Merge pull request #391 from haraldkoch/patch-1
...
remove "set echo" added by the "command cd" fix
7 years ago
Martin Gondermann
79a75b73db
Merge pull request #395 from cboltz/master
...
change default for GIT_PROMPT_SHOW_UNTRACKED_FILES to `normal`
7 years ago
Christian Boltz
45a654b51e
change default for GIT_PROMPT_SHOW_UNTRACKED_FILES to `normal`
...
The old default of `all` counts all untracked files - including files
listed in .gitignore, which basically makes that information worthless.
`normal` is the default if --show-untracked is not given, and will
list/count the same files as a `git status` will list.
8 years ago
Harald Koch
90bba04b33
remove "set echo" added by the "command cd" fix
...
In commit 8ed0d31e8e , which was only supposed to change "cd" to "command cd", this "set echo" line was also added. This command stomps on the shell's argument list, which (through a complicated chain of events) causes logins under lightdm on Linux to fail.
8 years ago
Martin Gondermann
5356702cf5
Merge pull request #386 from mazerj/master
...
Changed `cd` to `command cd` to force use of bash builtin cd command
8 years ago
Jamie Mazer
8ed0d31e8e
Changed `cd` to `command cd` to force use of bash builtin cd command
8 years ago
Martin Gondermann
19c8def6a9
Merge pull request #376 from IgorMinar/patch-1
...
support new lines in original $PROMPT_COMMAND
8 years ago
Igor Minar
40958b34d8
support new lines in original $PROMPT_COMMAND
...
This fixes an obscure error that occurs when the original $PROMPT_COMMAND contains new lines
For example if original $PROMPT_COMMAND is:
```
__bp_trap_string="$(trap -p DEBUG)"
trap DEBUG
__bp_install
```
this then results to the prompt var being set to:
```
setLastCommandState; __bp_trap_string="$(trap -p DEBUG)" trap DEBUG __bp_install ;setGitPrompt
```
which then blows up during `eval` with obscure:
```
bash: PROMPT_COMMAND: line 4: syntax error near unexpected token `;'
bash: PROMPT_COMMAND: line 4: `;setGitPrompt'
```
8 years ago
Martin Gondermann
3ff1a56cd5
Merge pull request #373 from ksinkar/rpm_spec
...
Making the SPEC file more standards compliant
8 years ago
Koustubh Sinkar
c07e0fe86f
Making the SPEC file more standards compliant
...
1. Adding comments after %build as building is not
required in this case
2. Putting the %post and %postun sections after %clean
3. Adding to the %changelog
8 years ago
Martin Gondermann
f0880e57bf
Merge pull request #371 from HarrySarson/gitattributes
...
Adds .gitattributes to keep unix lines endings in .sh files; closes #345
8 years ago
Harry Sarson
2fd23c490b
Adds .gitattributes to keep unix lines endings in .sh files
8 years ago
Martin Gondermann
7857a9b542
Merge pull request #370 from hotpocket/master
...
return right away so a success looks like "1" instead of "1 0"
8 years ago
hotpocket
7c2216a408
prefer if/else. magicmonty/bash-git-prompt/pull/370
8 years ago
hotpocket
de16dd6b97
return right away so a success looks like "1" instead of "1 0"
8 years ago
Martin Gondermann
e4954a791c
Merge pull request #369 from jmohr00/fetch-no-prompt
...
Suppress fetch password prompt
8 years ago
Justin Mohr
f5323ff66b
Suppress fetch password prompt
...
When GIT_PROMPT_FETCH_REMOTE_STATUS is nonzero, suppresses useless password prompts created by the remote status failing to be updated
Fixes magicmonty/bash-git-prompt#354
8 years ago
Martin Gondermann
d9accd1f63
Merge pull request #365 from andreer/patch-1
...
fix typo
8 years ago
Andreas Eriksen
2c26470469
fix typo
8 years ago
Martin Gondermann
b4dddb05d9
Bump version in HomeBrew formula to 2.7.1
8 years ago
Martin Gondermann
d8d99a128d
Add state and step
...
fixes #360
8 years ago
Martin Gondermann
f1838254ee
Merge pull request #364 from Ramon-Balaguer/master
...
Add new theme 1row solarized lamda
8 years ago
Ramon Balaguer Altadill
56d0533a67
Add new theme 1row solarized lamda
8 years ago
Martin Gondermann
d70d1a7ad2
Merge branch 'cboltz-cboltz-mastercolor'
8 years ago
Martin Gondermann
6791792ae3
Set GIT_PROMPT_MASTER_BRANCH to GIT_PROMPT_BRANCH by default
8 years ago
Martin Gondermann
c054c66fb9
Merge branch 'cboltz-mastercolor' of https://github.com/cboltz/bash-git-prompt into cboltz-cboltz-mastercolor
8 years ago
Martin Gondermann
c427520cdf
Update README
8 years ago
Martin Gondermann
0bd011c725
Add possibility to ignore submodules also in .bash-git-rc
...
see also #351
8 years ago
Martin Gondermann
b1f005a8a2
Add possibility to ignore submodules
...
See #351
8 years ago
Christian Boltz
7deca313db
add $GIT_PROMPT_MASTER_BRANCH to all themes
...
... that set $GIT_PROMPT_BRANCH, using the same color as
$GIT_PROMPT_BRANCH to avoid unintended changes.
8 years ago
Christian Boltz
4b8c8da3ef
Allow different color for master branch
...
- add $GIT_PROMPT_MASTER_BRANCH - color for master branch
- add $GIT_PROMPT_MASTER_BRANCHES - branch name(s) that use
$GIT_PROMPT_MASTER_BRANCH color, 'master' by default)
All other branches will continue to use $GIT_PROMPT_BRANCH
Fixes https://github.com/magicmonty/bash-git-prompt/issues/311
8 years ago
Martin Gondermann
50eb8fbeaf
Merge pull request #356 from munikes/master
...
Add nodeenv to prompt virtuals env
8 years ago
Martin Gondermann
e0146fdcec
Merge pull request #353 from nono031/master
...
Add Single_line_Dark.bgptheme theme
8 years ago
mUniKeS
ed0dc9347b
Add nodeenv to prompt virtuals env
8 years ago
sevin
a1314381da
Add Single_line_Dark.bgptheme theme
8 years ago
Martin Gondermann
bc607a7133
Merge pull request #346 from korzeniewskipl/fishfix
...
Fishfix
8 years ago
Paweł Korzeniewski
9c82beddd7
Fix fish_prompt function.
8 years ago
Paweł Korzeniewski
d0bdc7d9a2
Make __GIT_PROMPT_DIR value consistent with default installation path.
8 years ago
Martin Gondermann
5501128b78
Bump version in spec to 2.6.3, update Homebrew Formula
8 years ago
2e617b0e80
Merge branch 'iliakan-master'
8 years ago
709ff6cd09
Merge branch 'master' of https://github.com/iliakan/bash-git-prompt into iliakan-master
8 years ago
Ilya Kantor
1d6089e80b
Made compatible with git 2.14 on empty repo
8 years ago
Martin Gondermann
f2da28fae1
Merge pull request #339 from supermamon/master
...
Fixed Chmike reload call
8 years ago
Raymond Velasquez
0c3c3819af
Fixed Chmike reload call
8 years ago
Ilya Kantor
806889d155
Add separator to status only if something follow it
8 years ago
Martin Gondermann
a8b3d9e393
Merge pull request #335 from NorbertRonecker/master
...
Single Line Theme for Gentoo Prompt without Exit State
9 years ago
Norbert Ronecker
4ac5e67afc
Single Line Theme for Gentoo Default Prompt without Exit State
9 years ago
Martin Gondermann
a529134708
Merge pull request #332 from fvoges/fix_solarized_root_color
...
change root prompt to reset color at the end on Single_line_Solarized
9 years ago