agieche · December 21, 2015 13:59 · Aug 23, 2013 · Aug 23, 2013 · Aug 23, 2013 · Aug 23, 2013
diff --git a/.bash_profile b/.bash_profile
@@ -26,4 +26,4 @@ BLINK=$(tput blink)
 REVERSE=$(tput smso)
 UNDERLINE=$(tput smul)
 
-PS1='\n\n\n${NORMAL}${CYAN}(`date "+%H:%M:%S"`) ${RED}\W${YELLOW}${WHITE}`__git_ps1 "::${GREEN}%s"`${WHITE}\n'
+PS1='\n\n${NORMAL}${CYAN}(`date "+%H:%M:%S"`) ${RED}\W${YELLOW}${WHITE}`__git_ps1 "::${GREEN}%s"`${WHITE}\n'
diff --git a/.bash_profile b/.bash_profile
@@ -26,19 +26,4 @@ BLINK=$(tput blink)
 REVERSE=$(tput smso)
 UNDERLINE=$(tput smul)
 
-# set the prompt to show current working directory and git branch name, if it exists
-
-# this prompt is a green username, black @ symbol, cyan host, magenta current working directory and white git branch (only shows if you're in a git branch)
-# unstaged and untracked symbols are shown, too (see above)
-# this prompt uses the short colour codes defined above
-# PS1='${GREEN}\u${BLACK}@${CYAN}\h:${MAGENTA}\w${WHITE}`__git_ps1 " (%s)"`\$ '
-
-# this is a cyan username, @ symbol and host, magenta current working directory and white git branch
-# it uses the shorter , but visibly more complex, codes for text colours (shorter because the colour code definitions aren't needed)
-# PS1='\[\033[0;36m\]\u@\h\[\033[01m\]:\[\033[0;35m\]\w\[\033[00m\]\[\033[1;30m\]\[\033[0;37m\]`__git_ps1 " (%s)"`\[\033[00m\]\[\033[0;37m\]\$ '
-
-# and here's one similar to Paul Irish's famous prompt ... not sure if this is the way he does it, but it works  :)
-# \033[s = save cursor position
-# \033[u = restore cursor position
-
-PS1='\n\n${NORMAL}${CYAN}(`date "+%H:%M:%S"`) ${RED}\u${WHITE} in ${YELLOW}\w${YELLOW}${WHITE}`__git_ps1 " on ${GREEN}%s"`\n${WHITE}${BRIGHT} => '
+PS1='\n\n\n${NORMAL}${CYAN}(`date "+%H:%M:%S"`) ${RED}\W${YELLOW}${WHITE}`__git_ps1 "::${GREEN}%s"`${WHITE}\n'
diff --git a/gistfile1.sh → .bash_profile b/gistfile1.sh → .bash_profile
@@ -37,18 +37,8 @@ UNDERLINE=$(tput smul)
 # it uses the shorter , but visibly more complex, codes for text colours (shorter because the colour code definitions aren't needed)
 # PS1='\[\033[0;36m\]\u@\h\[\033[01m\]:\[\033[0;35m\]\w\[\033[00m\]\[\033[1;30m\]\[\033[0;37m\]`__git_ps1 " (%s)"`\[\033[00m\]\[\033[0;37m\]\$ '
 
-# return the prompt prefix for the second line
-function set_prefix {
-    BRANCH=`__git_ps1`
-    if [[ -z $BRANCH ]]; then
-        echo "${NORMAL}o"
-    else
-        echo "${UNDERLINE}+"
-    fi
-}
-
 # and here's one similar to Paul Irish's famous prompt ... not sure if this is the way he does it, but it works  :)
 # \033[s = save cursor position
 # \033[u = restore cursor position
 
-PS1='\n\n${NORMAL}${CYAN}(`date "+%H:%M:%S"`) ${RED}\u${WHITE} in ${YELLOW}\w${YELLOW}${WHITE}`__git_ps1 " on ${GREEN}%s"`${GREEN}\r\n${WHITE}${BRIGHT} => '
+PS1='\n\n${NORMAL}${CYAN}(`date "+%H:%M:%S"`) ${RED}\u${WHITE} in ${YELLOW}\w${YELLOW}${WHITE}`__git_ps1 " on ${GREEN}%s"`\n${WHITE}${BRIGHT} => '
diff --git a/gistfile1.sh b/gistfile1.sh
@@ -0,0 +1,54 @@
+# enable git unstaged indicators - set to a non-empty value
+GIT_PS1_SHOWDIRTYSTATE="."
+
+# enable showing of untracked files - set to a non-empty value
+GIT_PS1_SHOWUNTRACKEDFILES="."
+
+# enable stash checking - set to a non-empty value
+GIT_PS1_SHOWSTASHSTATE="."
+
+# enable showing of HEAD vs its upstream
+GIT_PS1_SHOWUPSTREAM="auto"
+
+BLACK=$(tput setaf 0)
+RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+YELLOW=$(tput setaf 3)
+LIME_YELLOW=$(tput setaf 190)
+POWDER_BLUE=$(tput setaf 153)
+BLUE=$(tput setaf 4)
+MAGENTA=$(tput setaf 5)
+CYAN=$(tput setaf 6)
+WHITE=$(tput setaf 7)
+BRIGHT=$(tput bold)
+NORMAL=$(tput sgr0)
+BLINK=$(tput blink)
+REVERSE=$(tput smso)
+UNDERLINE=$(tput smul)
+
+# set the prompt to show current working directory and git branch name, if it exists
+
+# this prompt is a green username, black @ symbol, cyan host, magenta current working directory and white git branch (only shows if you're in a git branch)
+# unstaged and untracked symbols are shown, too (see above)
+# this prompt uses the short colour codes defined above
+# PS1='${GREEN}\u${BLACK}@${CYAN}\h:${MAGENTA}\w${WHITE}`__git_ps1 " (%s)"`\$ '
+
+# this is a cyan username, @ symbol and host, magenta current working directory and white git branch
+# it uses the shorter , but visibly more complex, codes for text colours (shorter because the colour code definitions aren't needed)
+# PS1='\[\033[0;36m\]\u@\h\[\033[01m\]:\[\033[0;35m\]\w\[\033[00m\]\[\033[1;30m\]\[\033[0;37m\]`__git_ps1 " (%s)"`\[\033[00m\]\[\033[0;37m\]\$ '
+
+# return the prompt prefix for the second line
+function set_prefix {
+    BRANCH=`__git_ps1`
+    if [[ -z $BRANCH ]]; then
+        echo "${NORMAL}o"
+    else
+        echo "${UNDERLINE}+"
+    fi
+}
+
+# and here's one similar to Paul Irish's famous prompt ... not sure if this is the way he does it, but it works  :)
+# \033[s = save cursor position
+# \033[u = restore cursor position
+
+PS1='\n\n${NORMAL}${CYAN}(`date "+%H:%M:%S"`) ${RED}\u${WHITE} in ${YELLOW}\w${YELLOW}${WHITE}`__git_ps1 " on ${GREEN}%s"`${GREEN}\r\n${WHITE}${BRIGHT} => '