diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-12-28 00:13:06 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-12-28 00:13:06 +1300 |
commit | 8215cba30d96b421ff0b434b5900fa60af5e1a4b (patch) | |
tree | e0a800d9f03580d8daf7524f40cafd8fe9e28061 /bash/bashrc.d | |
parent | Merge branch 'release/v4.0.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-8215cba30d96b421ff0b434b5900fa60af5e1a4b.tar.gz dotfiles-8215cba30d96b421ff0b434b5900fa60af5e1a4b.zip |
Merge branch 'release/v4.1.0'v4.1.0
* release/v4.1.0:
Bump VERSION
Correct typo in stub vimrc
Remove some vestigial Bash 2.05 guards/comments
Break up some long lines
Two-space sentences in VimL comments
Two-space sentences in shell comments
Break up some long lines
Fix long lines in manual pages
Two-space sentences in manual pages
Adjust sentence spacing of README.md
Remove highlight double-quote VimL comment strings
Diffstat (limited to 'bash/bashrc.d')
-rw-r--r-- | bash/bashrc.d/keep.bash | 2 | ||||
-rw-r--r-- | bash/bashrc.d/prompt.bash | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/bash/bashrc.d/keep.bash b/bash/bashrc.d/keep.bash index 191dac4b..6796aae7 100644 --- a/bash/bashrc.d/keep.bash +++ b/bash/bashrc.d/keep.bash @@ -2,7 +2,7 @@ # keep -- Main function for bashkeep; provided with a list of NAMEs, whether # shell functions or variables, writes the current definition of each NAME to a # directory $BASHKEEP (defaults to ~/.bashkeep.d) with a .bash suffix, each of -# which is reloaded each time this file is called. This allows you to quickly +# which is reloaded each time this file is called. This allows you to quickly # arrange to keep that useful shell function or variable you made inline on # subsequent logins. # diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash index 26e10cd4..f9678f20 100644 --- a/bash/bashrc.d/prompt.bash +++ b/bash/bashrc.d/prompt.bash @@ -160,8 +160,9 @@ prompt() { fi # There are some untracked and unignored files - if git ls-files --directory --error-unmatch --exclude-standard \ - --no-empty-directory --others -- ':/*' ; then + if git ls-files --directory --error-unmatch \ + --exclude-standard --no-empty-directory \ + --others -- ':/*' ; then state=${state}'?' fi |