diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-20 23:00:28 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-21 02:54:23 -0500 |
| commit | ac39160cd27cd4a57dbea80db6fbaec21ddb6ff4 (patch) | |
| tree | 5799defe951623c5c76079e41e83b5e2811fc10b | |
| parent | 5989a57734dfd4d6cb7eb0045a008dfdc90c2fbb (diff) | |
| download | git-ac39160cd27cd4a57dbea80db6fbaec21ddb6ff4.tar.xz | |
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>
| -rwxr-xr-x | git-gui.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/git-gui.sh b/git-gui.sh index be286b0e78..1d342392ab 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1957,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]] |