git-gui: Cleanup state descriptions.

[thirdparty/git.git] / git-gui.sh

diff --git a/git-gui.sh b/git-gui.sh
index 9a2b70b47558046bcdda3702c83a347e8e08fae5..1d342392abfbd36de6b588077acb3c4a693171f0 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1114,8 +1114,7 @@ proc commit_committree {fd_wt curHEAD msg} {
                AM -
                AD -
                MM -
-               MD -
-               DM {
+               MD {
                        set file_states($path) [list \
                                _[string index $m 1] \
                                [lindex $s 1] \
@@ -1958,24 +1957,24 @@ set all_icons(O$ui_workdir) file_plain
 set max_status_desc 0
 foreach i {
                {__ "Unmodified"}
-               {_M "Modified"}
-               {M_ "Added to commit"}
-               {MM "Partially added"}
-               {MD "Added (but gone)"}
 
-               {_O "Untracked"}
-               {A_ "Added by commit"}
-               {AM "Partially added"}
-               {AD "Added (but gone)"}
+               {_M "Modified, not staged"}
+               {M_ "Staged for commit"}
+               {MM "Portions staged for commit"}
+               {MD "Staged for commit, missing"}
+
+               {_O "Untracked, not staged"}
+               {A_ "Staged for commit"}
+               {AM "Portions staged for commit"}
+               {AD "Staged for commit, missing"}
 
                {_D "Missing"}
-               {D_ "Removed by commit"}
-               {DO "Removed (still exists)"}
-               {DM "Removed (but modified)"}
+               {D_ "Staged for removal"}
+               {DO "Staged for removal, still present"}
 
-               {UD "Merge conflicts"}
-               {UM "Merge conflicts"}
-               {U_ "Merge conflicts"}
+               {U_ "Requires merge resolution"}
+               {UM "Requires merge resolution"}
+               {UD "Requires merge resolution"}
        } {
        if {$max_status_desc < [string length [lindex $i 1]]} {
                set max_status_desc [string length [lindex $i 1]]
@@ -2872,8 +2871,7 @@ proc toggle_or_diff {w x y} {
                A_ -
                M_ -
                D_ -
-               DO -
-               DM {
+               DO {
                        update_indexinfo \
                                "Removing [short_path $path] from commit" \
                                [list $path] \