Merge pull request lvv#38 from killphi/cleanup

Cleanup

Makefile

@@ -12,10 +12,10 @@ COPY_LIST = git-prompt.sh
 
 
 install:
-	cp -v git-prompt.sh 	/etc/
-	[ -f /etc/git-prompt.conf ]  || cp -v git-prompt.conf /etc/
-	
+        cp -v git-prompt.sh /etc/
+        [ -f /etc/git-prompt.conf ]  || cp -v git-prompt.conf /etc/
+
 tgit:
-	xclip -i git-demo
-	echo "ready to paste ..."
+        xclip -i git-demo
+        echo "ready to paste ..."
 

demo-script

@@ -2,7 +2,7 @@ cd p/git-prompt
 . ./git-prompt.sh
 cd
 test -d demo && rm -rf demo/
-test -d ../demo && cd .. && rm -rf demo/ 
+test -d ../demo && cd .. && rm -rf demo/
 clear
 : ------------------------------------------------------------------------
 clear
@@ -15,21 +15,21 @@ touch  untracked.o
 echo '*.o' >> .gitignore
 git commit -q -m "1st line"  FOO
 git checkout -b test
-echo "added 2nd line in test" >> FOO 
-git add FOO 
+echo "added 2nd line in test" >> FOO
+git add FOO
 echo "2nd in BAR" > BAR
 git add BAR
-echo "added 3nd line FOO" >> FOO 
+echo "added 3nd line FOO" >> FOO
 git add FOO
 git commit -q -m "FOO moded, BAR added"
 git checkout master
-cat FOO 
-echo "now added 2nd line in master" >> FOO 
+cat FOO
+echo "now added 2nd line in master" >> FOO
 git add FOO
 git commit -q -m "2nd line"
 git merge test
 git cat-file -p test:FOO > FOO
-git add FOO 
+git add FOO
 git commit -q -m "merged"
 cat FOO
 git checkout HEAD^

git-prompt.conf

@@ -1,8 +1,5 @@
-
 ###  GIT-PROMPT.SH CONFIG
-###
-###    lines commented-out with single '#' are default values
-###    lines commented-out with double '##' are examples
+### ###    lines commented-out with single '#' are default values ###    lines commented-out with double '##' are examples
 ###
 ###    NOTE: this is bash syntax - no spaces around "="
 
@@ -25,9 +22,9 @@
 ###########################################################   DEFAULT OBJECTS
 ###  Default objects are not displayed.  Example:
 
-## default_user=lvv             
+## default_user=lvv
 ## default_host="ahp"                   # remote host is always shown
-## default_domain="lvvnet"      
+## default_domain="lvvnet"
 
 ###########################################################   Current Working Dir display
 #  cwd_cmd='\w'                 # display full path
@@ -46,34 +43,34 @@
 #  they are always dirty  (ex: home, /etc) or directory with huge repo (ex: linux src)
 ## vcs_ignore_dir_list=" /etc $HOME /usr/src/linux.git "
 
-###########################################################   COLOR 
+###########################################################   COLOR
 
-###  directory, exit code, root color 
+###  directory, exit code, root color
 
 #        cols=`tput colors`
-#        if [[ -n "$cols" && $cols -ge 8 ]];  then                              #  if terminal supports colors
-        #       dir_color=CYAN
-        #       rc_color=red
-        #       virtualenv_color=green
-        #       user_id_color=blue
-        #       root_id_color=magenta
+# if [[ -n "$cols" && $cols -ge 8 ]];  then                              #  if terminal supports colors
+#       dir_color=CYAN
+#       rc_color=red
+#       virtualenv_color=green
+#       user_id_color=blue
+#       root_id_color=magenta
 # else                                          #  B/W terminal
-        #       dir_color=bw_bold
-        #       rc_color=bw_bold
+#       dir_color=bw_bold
+#       rc_color=bw_bold
 # fi
 
 ### prompt character for root/non-root, default '>' for both
-#	prompt_char='>'
-#	root_prompt_char='>'
-##	prompt_char='$'
-##	prompt_char='➔'
-##	root_prompt_char='#'
+#            prompt_char='>'
+#       root_prompt_char='>'
+##           prompt_char='$'
+##           prompt_char='➔'
+##      root_prompt_char='#'
 
 #####  Per host color
 
 ### Per host color.  If not set, color will be derived from hostname checksum).
 ### Variable name is uppercase-short-hostname with appended "_host_color"
-### Example per-host-color config:  
+### Example per-host-color config:
 
 ##          TASHA_host_color=cyan
 ##             AL_host_color=green
@@ -86,11 +83,11 @@
 #               clean_vcs_color=blue      # nothing to commit (working directory clean)
 #            modified_vcs_color=red       # Changed but not updated:
 #               added_vcs_color=green     # Changes to be committed:
-#               mixed_vcs_color=yellow    # 
+#               mixed_vcs_color=yellow    #
 #           untracked_vcs_color=BLUE      # Untracked files:
 #                  op_vcs_color=MAGENTA
 #            detached_vcs_color=RED
-#                 hex_vcs_color=BLACK	  # git revision id:  bright black (makes gray)
+#                 hex_vcs_color=BLACK     # git revision id:  bright black (makes gray)
 
 
-# :vim:ft=sh ts=8 sw=8 et:
+# :vim:ft=sh ts=8 sts=8 sw=8 et: