diff options
| author | Leonid Volnitsky <Leonid@Volnitsky.com> | 2008-06-17 09:42:24 +0300 |
|---|---|---|
| committer | Leonid Volnitsky <Leonid@Volnitsky.com> | 2008-06-17 09:43:00 +0300 |
| commit | 292d332bfbaa4714c11006ac8a9d66a7aa519448 (patch) | |
| tree | e8c1de57d9402df4dcd3c74da931c8594282ca28 /prompt | |
| parent | added detached state and corresponding display of branch (diff) | |
| download | git-prompt-292d332bfbaa4714c11006ac8a9d66a7aa519448.tar.gz git-prompt-292d332bfbaa4714c11006ac8a9d66a7aa519448.tar.bz2 git-prompt-292d332bfbaa4714c11006ac8a9d66a7aa519448.zip | |
fix: when doing "rebase -i" there are files called "unmerged" in status. Now collected into modified_files
Diffstat (limited to 'prompt')
| -rwxr-xr-x | prompt | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -264,7 +264,8 @@ PROMPT_COMMAND=' /^# Changed but not updated:/,/^# [A-Z]/ { s/^# Changed but not updated:/modified=modified/p - s/# modified: /git_modified_files+=\" \"/p + s/^# modified: /git_modified_files+=\" \"/p + s/^# unmerged: /git_modified_files+=\" \"/p } /^# Changes to be committed:/,/^# [A-Z]/ { |