XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge c4c6282803 into 60d6724470

pull/384/merge
Amanuel Nega 2014-12-18 07:36:46 +00:00
parent 60d6724470 c4c6282803
commit 3292a51923
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aliases/available/git.aliases.bash
View File

@ -70,3 +70,8 @@ if [ -z "$EDITOR" ]; then
else else
alias gd="git diff | $EDITOR" alias gd="git diff | $EDITOR"
fi fi
#Aliases to mark untracked files as dirty or not
alias bash-it-untracked-files-dirty="export BASH_IT_GIT_UNTRACKED_FILES_DIRTY=true"
alias bash-it-untracked-files-not-dirty="export BASH_IT_GIT_UNTRACKED_FILES_DIRTY=false"

3
template/bash_profile.template.bash
View File

@ -23,6 +23,9 @@ export GIT_EDITOR='/usr/bin/mate -w'
# Set the path nginx # Set the path nginx
export NGINX_PATH='/opt/nginx' export NGINX_PATH='/opt/nginx'
# Set ignoring untracked files to false
export BASH_IT_GIT_UNTRACKED_FILES_DIRTY=true
# Don't check mail when opening terminal. # Don't check mail when opening terminal.
unset MAILCHECK unset MAILCHECK

6
themes/base.theme.bash
View File

@ -78,8 +78,12 @@ function git_prompt_vars {
SCM_GIT_AHEAD='' SCM_GIT_AHEAD=''
SCM_GIT_BEHIND='' SCM_GIT_BEHIND=''
SCM_GIT_STASH='' SCM_GIT_STASH=''
SCM_GIT_ARGUMENTS='--porcelain'
if [ "$BASH_IT_GIT_UNTRACKED_FILES_DIRTY" == false ]; then
SCM_GIT_ARGUMENTS="$SCM_GIT_ARGUMENTS -uno"
fi
if [[ "$(git config --get bash-it.hide-status)" != "1" ]]; then if [[ "$(git config --get bash-it.hide-status)" != "1" ]]; then
local status="$(git status -b --porcelain 2> /dev/null || git status --porcelain 2> /dev/null)" local status="$(git status -b $SCM_GIT_ARGUMENTS 2> /dev/null || git status $SCM_GIT_ARGUMENTS 2> /dev/null)"
if [[ -n "${status}" ]] && [[ "${status}" != "\n" ]] && [[ -n "$(grep -v ^# <<< "${status}")" ]]; then if [[ -n "${status}" ]] && [[ "${status}" != "\n" ]] && [[ -n "$(grep -v ^# <<< "${status}")" ]]; then
SCM_DIRTY=1 SCM_DIRTY=1
SCM_STATE=${GIT_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY} SCM_STATE=${GIT_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY}