diff options
| author | dakkar <dakkar@thenautilus.net> | 2016-04-27 14:31:43 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2016-04-27 14:31:43 +0100 |
| commit | 92b533ae904693ef5f2cfcd1069a6e6a184e8d76 (patch) | |
| tree | 9e2a3a7f655eaecd195849f4c2cd933ca5ec8607 | |
| parent | Remove back references in freshness detection code (diff) | |
| parent | Merge branch 'master' of github.com:lvv/git-prompt (diff) | |
| download | git-prompt-92b533ae904693ef5f2cfcd1069a6e6a184e8d76.tar.gz git-prompt-92b533ae904693ef5f2cfcd1069a6e6a184e8d76.tar.bz2 git-prompt-92b533ae904693ef5f2cfcd1069a6e6a184e8d76.zip | |
Merge remote-tracking branch 'origin/master' into dakkar
| -rwxr-xr-x | git-prompt.sh | 3 | ||||
| -rw-r--r-- | screenshot-labels.png | bin | 200455 -> 228712 bytes | |||
| -rw-r--r-- | screenshot-prompt-basic.png | bin | 16849 -> 21958 bytes | |||
| -rw-r--r-- | screenshot-prompt-git.png | bin | 147592 -> 184687 bytes | |||
| -rw-r--r-- | screenshot-svn.png | bin | 12835 -> 12996 bytes |
5 files changed, 2 insertions, 1 deletions
diff --git a/git-prompt.sh b/git-prompt.sh index 89996d8..66abb07 100755 --- a/git-prompt.sh +++ b/git-prompt.sh @@ -182,7 +182,7 @@ cwd_truncate() { # arg1: max path lenght # returns abbrivated $PWD in public "cwd" var - cwd="${PWD/$HOME/~}" # substitute "~" + cwd="${PWD/$HOME/\~}" # substitute "~" case $1 in full) @@ -431,6 +431,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 Binary files differindex 71f3513..4032700 100644 --- a/screenshot-labels.png +++ b/screenshot-labels.png diff --git a/screenshot-prompt-basic.png b/screenshot-prompt-basic.png Binary files differindex 237e0ec..13c31c5 100644 --- a/screenshot-prompt-basic.png +++ b/screenshot-prompt-basic.png diff --git a/screenshot-prompt-git.png b/screenshot-prompt-git.png Binary files differindex eccbc3e..3618a28 100644 --- a/screenshot-prompt-git.png +++ b/screenshot-prompt-git.png diff --git a/screenshot-svn.png b/screenshot-svn.png Binary files differindex 6b9dec7..97fa06c 100644 --- a/screenshot-svn.png +++ b/screenshot-svn.png |
