Merge remote-tracking branch 'lvv/master'

Merging upstream

Conflicts:
	git-prompt.conf
	git-prompt.sh

Makefile

@@ -1,7 +1,16 @@
-HOMEDIR ?= /home/lvv/p/volnitsky.com/
-include $(HOMEDIR)/include.mk
+ifeq ($(USER),lvv)
+        HOMEDIR := /home/lvv/p/volnitsky.com/
+        INCLUDE := $(HOMEDIR)/include.mk
+else
+        INCLUDE := /dev/null
+endif
+
+include $(INCLUDE)
+
+
 COPY_LIST = git-prompt.sh
 
+
 install:
 	cp -v git-prompt.sh 	/etc/
 	[ -f /etc/git-prompt.conf ]  || cp -v git-prompt.conf /etc/

README

@@ -2,3 +2,4 @@ GIT Prompt for BASH
 
 Screenshots and docs are at: http://volnitsky.com/project/git-prompt
 
+

git-prompt.conf

@@ -10,14 +10,16 @@
 
 # error_bell=off                # sound terminal bell when command return code is not zero. (use setterm to set pitch and duration)
 # max_file_list_length=100      # in characters
-
+# count_only=off                # off - display file list; on - display file count
+# rawhex_len=5                  # length of git rawhex revision id display (use 0 to hide it)
 
 ############################################################   MODULES
 
 # git_module=on
 # svn_module=off
 # hg_module=on
 # vim_module=on
+# virtualenv_module=on
 
 
 ###########################################################   DEFAULT OBJECTS
@@ -36,6 +38,8 @@
 
 #  Some don't like hostname in uppercase
 #  upcase_hostname=on # =off
+#  Some don't like long hostname
+#  short_hostname=off # =on
 
 #  Do not do VCS parsing for listed directories
 #  useful for directories for which it is difficult to maintain .gitignore so
@@ -50,6 +54,7 @@
 #        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
@@ -65,7 +70,7 @@
 
 #####  Per host color
 
-### Per host color.  If not set, color will be derived from name of host checksum).
+### 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:  
 
@@ -84,6 +89,7 @@
 #           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)
 
 
 # :vim:ft=sh ts=8 sw=8 et: