summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-prompt.sh5
-rw-r--r--index.txt9
2 files changed, 10 insertions, 4 deletions
diff --git a/git-prompt.sh b/git-prompt.sh
index cab5530..2aa9987 100755
--- a/git-prompt.sh
+++ b/git-prompt.sh
@@ -7,7 +7,8 @@
##### read config file if any.
- unset dir_color rc_color root_id_color init_vcs_color clean_vcs_color modified_vcs_color added_vcs_color mixed_vcs_color untracked_vcs_color op_vcs_color detached_vcs_color
+ unset dir_color rc_color root_id_color init_vcs_color clean_vcs_color
+ unset modified_vcs_color added_vcs_color mixed_vcs_color untracked_vcs_color op_vcs_color detached_vcs_color
conf=git-prompt.conf; [[ -r $conf ]] && . $conf
conf=/etc/git-prompt.conf; [[ -r $conf ]] && . $conf
@@ -50,7 +51,7 @@
##################################################################### post config
################# make PARSE_VCS_STATUS
-
+ PARSE_VCS_STATUS=""
[[ $git_module = "on" ]] && type git >&/dev/null && PARSE_VCS_STATUS="parse_git_status"
[[ $svn_module = "on" ]] && type svn >&/dev/null && PARSE_VCS_STATUS+="||parse_svn_status"
[[ $hg_module = "on" ]] && type hg >&/dev/null && PARSE_VCS_STATUS+="||parse_hg_status"
diff --git a/index.txt b/index.txt
index fb0d833..ede417e 100644
--- a/index.txt
+++ b/index.txt
@@ -34,20 +34,25 @@ image:screenshot-prompt-git.png[git module screenshot]
|================================================================
-== Subversion
+== Subversion/SVN
image:screenshot-svn.png[svn module screenshot]
SVN module disabled by default because even on moderate sized working
directories there is noticeable delay for prompt display. SVN is slower than
GIT. Enable if needed in <<config,config>>
+== Mercurial/HG
+Was recently added thanks to Lee Nussbaum <wln@scrunch.org>.
+
== Labels
Labels are visual cues to help figure out what terminal is running what command.
It is generalization of xterm-title but differ from xterm-title that it
can be displayed in other places (on Screen(1) windows titles for example).
-On screenshot below they are in red ovals.
+Also label can display currently executed command (when bash prompt obviously
+is not displayed).
+On screenshot below labels are in red ovals.
image:screenshot-labels.png["labels screenshot", width="300", link="screenshot-labels.png"]