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 | |
| 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
| -rw-r--r-- | README | 33 | ||||
| -rw-r--r-- | git-demo | 2 | ||||
| -rw-r--r-- | git-prompt.sh | 2 |
3 files changed, 20 insertions, 17 deletions
@@ -1,26 +1,29 @@ GIT Prompt for BASH Picture worth a thousand words, see wiki for screenshots + http://github.com/lvv/git-prompt/wikis -DEPENDECY - bash (tested with v3.2.33) - git (optinal) - svn (optinal) - sed - tput (terminfo) - tty - grep - locale - id +DEPENDENCY + bash (tested with v3.2.33) + git (optional) + svn (optional) + sed + tput (from terminfo) + tty + grep + locale + id TODO - - limit number of files displayed - - VIM module needs to be moved out of GIT module - - make module - - wiki/screanshots for labels and svn module - - How detect current merge? (current method through .git/MERGE_HEAD not always works) + - external config at /etc/git-prompt.conf and ~/.git-prompt.conf + - wiki/screen-shots for labels and svn module + - VIM module needs to be moved out of GIT module + - make module (to show generated, stale files) + - How detect current merge? (current method through .git/MERGE_HEAD not always works) +DONE + - limit number of files displayed @@ -23,7 +23,7 @@ echo 'main() {puts("Hello Universe!"); exit(0);}' > hello.c git add hello.c git commit -q -m "fixed exit code" git merge universe -git-cat-file -p universe:hello.c > hello.c +git cat-file -p universe:hello.c > hello.c git add hello.c git commit -q -m "merged" cat hello.c 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 |