Code

git-gui: Correct language for M_/A_ status codes.
authorShawn O. Pearce <spearce@spearce.org>
Mon, 13 Nov 2006 02:49:49 +0000 (21:49 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 13 Nov 2006 05:10:40 +0000 (00:10 -0500)
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>
git-gui

diff --git a/git-gui b/git-gui
index 1e5b0d049d069f68fe63c53d8c52255ef2cce04b..907db0e9dce005598c256366831558e378120274 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -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"}