summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-prompt.sh1
-rw-r--r--screenshot-labels.pngbin200455 -> 228712 bytes
-rw-r--r--screenshot-prompt-basic.pngbin16849 -> 21958 bytes
-rw-r--r--screenshot-prompt-git.pngbin147592 -> 184687 bytes
-rw-r--r--screenshot-svn.pngbin12835 -> 12996 bytes
5 files changed, 1 insertions, 0 deletions
diff --git a/git-prompt.sh b/git-prompt.sh
index 218c5b8..322164d 100755
--- a/git-prompt.sh
+++ b/git-prompt.sh
@@ -423,6 +423,7 @@ parse_git_status() {
#git_dir=` git rev-parse --git-dir 2> /dev/null`
[[ -n ${git_dir/./} ]] || return 1
+ [[ -f ${git_dir}/git-prompt-ignored ]] && return 1
vcs=git
diff --git a/screenshot-labels.png b/screenshot-labels.png
index 71f3513..4032700 100644
--- a/screenshot-labels.png
+++ b/screenshot-labels.png
Binary files differ
diff --git a/screenshot-prompt-basic.png b/screenshot-prompt-basic.png
index 237e0ec..13c31c5 100644
--- a/screenshot-prompt-basic.png
+++ b/screenshot-prompt-basic.png
Binary files differ
diff --git a/screenshot-prompt-git.png b/screenshot-prompt-git.png
index eccbc3e..3618a28 100644
--- a/screenshot-prompt-git.png
+++ b/screenshot-prompt-git.png
Binary files differ
diff --git a/screenshot-svn.png b/screenshot-svn.png
index 6b9dec7..97fa06c 100644
--- a/screenshot-svn.png
+++ b/screenshot-svn.png
Binary files differ