Merge branch 'thomasrebele-master'

master
Martin Gondermann 10 years ago
commit b2249ace8b
  1. 3
      README.md
  2. 3
      gitprompt.sh

@ -133,7 +133,8 @@ Add to the `~/.bashrc`:
# GIT_PROMPT_END=... # uncomment for custom prompt end sequence # GIT_PROMPT_END=... # uncomment for custom prompt end sequence
# as last entry source the gitprompt script # as last entry source the gitprompt script
# GIT_PROMPT_THEME=Custom # use custom .git-prompt-colors.sh # GIT_PROMPT_THEME=Custom # use custom theme specified in file GIT_PROMPT_THEME_FILE (default ~/.git-prompt-colors.sh)
# GIT_PROMPT_THEME_FILE=~/.git-prompt-colors.sh
# GIT_PROMPT_THEME=Solarized # use theme optimized for solarized color scheme # GIT_PROMPT_THEME=Solarized # use theme optimized for solarized color scheme
source ~/.bash-git-prompt/gitprompt.sh source ~/.bash-git-prompt/gitprompt.sh
``` ```

@ -26,6 +26,9 @@ function echoc() {
function get_theme() { function get_theme() {
local CUSTOM_THEME_FILE="${HOME}/.git-prompt-colors.sh" local CUSTOM_THEME_FILE="${HOME}/.git-prompt-colors.sh"
if [[ ! (-z ${GIT_PROMPT_THEME_FILE} ) ]]; then
CUSTOM_THEME_FILE=$GIT_PROMPT_THEME_FILE
fi
local DEFAULT_THEME_FILE="${__GIT_PROMPT_DIR}/themes/Default.bgptheme" local DEFAULT_THEME_FILE="${__GIT_PROMPT_DIR}/themes/Default.bgptheme"
if [[ -z ${GIT_PROMPT_THEME} ]]; then if [[ -z ${GIT_PROMPT_THEME} ]]; then

Loading…
Cancel
Save