summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-05-08 14:42:16 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-05-08 14:42:16 (GMT)
commitf0bc498ec17eeb046c3494126e2ff12339abde77 (patch)
tree46919c2c1f136744a05a6854c58b337eac6093c1
parentebcaadabcb90eaf35a3bd69a50cccce4be4dcc2c (diff)
parenta1a4975824e8f9f88a8c96ae908c488a2c6047c5 (diff)
downloadgit-f0bc498ec17eeb046c3494126e2ff12339abde77.zip
git-f0bc498ec17eeb046c3494126e2ff12339abde77.tar.gz
git-f0bc498ec17eeb046c3494126e2ff12339abde77.tar.bz2
Merge branch 'maint'
* maint: git-gui: Call changes "Staged" and "Unstaged" in file list titles.
-rwxr-xr-xgit-gui.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 4635825..84a3b62 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1638,7 +1638,7 @@ pack .vpane -anchor n -side top -fill both -expand 1
# -- Index File List
#
frame .vpane.files.index -height 100 -width 200
-label .vpane.files.index.title -text {Changes To Be Committed} \
+label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
-background green
text $ui_index -background white -borderwidth 0 \
-width 20 -height 10 \
@@ -1658,7 +1658,7 @@ pack $ui_index -side left -fill both -expand 1
# -- Working Directory File List
#
frame .vpane.files.workdir -height 100 -width 200
-label .vpane.files.workdir.title -text {Changed But Not Updated} \
+label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
-background red
text $ui_workdir -background white -borderwidth 0 \
-width 20 -height 10 \