@matheusbsbs / matheus-bagliano / commits / ac39160cd2
Fork 0

git-gui: Cleanup state descriptions.

Updated the state descriptions for individual file states to try and make them more closely align with what git-runstatus might display. This way a user who is reading Git documentation will be less confused by our descriptions. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Jan 20, 2007 at 23:00 UTC ac39160cd27cd4a57dbea80db6fbaec21ddb6ff4
1 file changed +14 -14
git-gui.sh
+14 -14
@@ -1957,24 +1957,24 @@ set all_icons(O$ui_workdir) file_plain
1957 set max_status_desc 0
1958 foreach i {
1959 {__ "Unmodified"}
1960 - {_M "Modified"}
1961 - {M_ "Added to commit"}
1962 - {MM "Partially added"}
1963 - {MD "Added (but gone)"}
1960
1965 - {_O "Untracked"}
1966 - {A_ "Added by commit"}
1967 - {AM "Partially added"}
1968 - {AD "Added (but gone)"}
1961 + {_M "Modified, not staged"}
1962 + {M_ "Staged for commit"}
1963 + {MM "Portions staged for commit"}
1964 + {MD "Staged for commit, missing"}
1965 +
1966 + {_O "Untracked, not staged"}
1967 + {A_ "Staged for commit"}
1968 + {AM "Portions staged for commit"}
1969 + {AD "Staged for commit, missing"}
1970
1971 {_D "Missing"}
1971 - {D_ "Removed by commit"}
1972 - {DO "Removed (still exists)"}
1973 - {DM "Removed (but modified)"}
1972 + {D_ "Staged for removal"}
1973 + {DO "Staged for removal, still present"}
1974
1975 - {UD "Merge conflicts"}
1976 - {UM "Merge conflicts"}
1977 - {U_ "Merge conflicts"}
1975 + {U_ "Requires merge resolution"}
1976 + {UM "Requires merge resolution"}
1977 + {UD "Requires merge resolution"}
1978 } {
1979 if {$max_status_desc < [string length [lindex $i 1]]} {
1980 set max_status_desc [string length [lindex $i 1]]