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>
This commit is contained in:
8
git-gui
8
git-gui
@ -1385,17 +1385,17 @@ set max_status_desc 0
|
|||||||
foreach i {
|
foreach i {
|
||||||
{__ i plain "Unmodified"}
|
{__ i plain "Unmodified"}
|
||||||
{_M i mod "Modified"}
|
{_M i mod "Modified"}
|
||||||
{M_ i fulltick "Checked in"}
|
{M_ i fulltick "Included in commit"}
|
||||||
{MM i parttick "Partially included"}
|
{MM i parttick "Partially included"}
|
||||||
|
|
||||||
{_O o plain "Untracked"}
|
{_O o plain "Untracked"}
|
||||||
{A_ o fulltick "Added"}
|
{A_ o fulltick "Added by commit"}
|
||||||
{AM o parttick "Partially added"}
|
{AM o parttick "Partially added"}
|
||||||
{AD o question "Added (but now gone)"}
|
{AD o question "Added (but now gone)"}
|
||||||
|
|
||||||
{_D i question "Missing"}
|
{_D i question "Missing"}
|
||||||
{D_ i removed "Removed"}
|
{D_ i removed "Removed by commit"}
|
||||||
{DD i removed "Removed"}
|
{DD i removed "Removed by commit"}
|
||||||
{DO i removed "Removed (still exists)"}
|
{DO i removed "Removed (still exists)"}
|
||||||
|
|
||||||
{UM i merge "Merge conflicts"}
|
{UM i merge "Merge conflicts"}
|
||||||
|
Reference in New Issue
Block a user