diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2006-11-12 21:49:49 -0500 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2006-11-13 00:10:40 -0500 |
commit | 135f76ed996b6a0478831c561e1cddd249b7e19d (patch) | |
tree | 6c015098da8ca94419ee5bb043c8e87df47a3f81 /git-gui | |
parent | c11b5f20d3bc2e8bc4fcd965b16e1575b87c0d5f (diff) | |
download | git-135f76ed996b6a0478831c561e1cddd249b7e19d.tar.gz |
git-gui: Correct language for M_/A_ status codes.
When I changed from 'check in' to 'include' I missed the human friendly
status displayed in the right side of the diff viewer heading. It was
still reporting 'Checked in' for a fully included file, which is not
what we wanted it to say.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui')
-rwxr-xr-x | git-gui | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1385,17 +1385,17 @@ set max_status_desc 0 foreach i { {__ i plain "Unmodified"} {_M i mod "Modified"} - {M_ i fulltick "Checked in"} + {M_ i fulltick "Included in commit"} {MM i parttick "Partially included"} {_O o plain "Untracked"} - {A_ o fulltick "Added"} + {A_ o fulltick "Added by commit"} {AM o parttick "Partially added"} {AD o question "Added (but now gone)"} {_D i question "Missing"} - {D_ i removed "Removed"} - {DD i removed "Removed"} + {D_ i removed "Removed by commit"} + {DD i removed "Removed by commit"} {DO i removed "Removed (still exists)"} {UM i merge "Merge conflicts"} |