diff options
| author | Leonid Volnitsky <Leonid@Volnitsky.com> | 2008-11-16 10:43:24 +0200 |
|---|---|---|
| committer | Leonid Volnitsky <Leonid@Volnitsky.com> | 2008-11-16 10:43:24 +0200 |
| commit | 45e89b4bc06e12260df11cc73eea29c2c12bfbbf (patch) | |
| tree | 6973bd51d0326bf7c0f8dc04a57b15e05af71f10 /git-prompt.sh | |
| parent | -- fixed minor: case when there is no tput, or it doesn't return anything (diff) | |
| download | git-prompt-45e89b4bc06e12260df11cc73eea29c2c12bfbbf.tar.gz git-prompt-45e89b4bc06e12260df11cc73eea29c2c12bfbbf.tar.bz2 git-prompt-45e89b4bc06e12260df11cc73eea29c2c12bfbbf.zip | |
-- minor: docs
Diffstat (limited to 'git-prompt.sh')
| -rw-r--r-- | git-prompt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-prompt.sh b/git-prompt.sh index cac80f8..d21786a 100644 --- a/git-prompt.sh +++ b/git-prompt.sh @@ -373,7 +373,7 @@ parse_git_dir() { elif [[ "$op" ]]; then branch="$op:$branch" if [[ "$op" == "merge" ]] ; then - branch+="<~$(git name-rev --name-only $(<$git_dir/MERGE_HEAD))" + branch+="<--$(git name-rev --name-only $(<$git_dir/MERGE_HEAD))" fi #branch="<$branch>" fi |