Merge branch 'maint'

* maint:
git-gui: Call changes "Staged" and "Unstaged" in file list titles.

diff --git a/git-gui.sh b/git-gui.sh
index 46358258bb65ceba68441c51fd69f212e9f817d3..84a3b6201156f0d7198334c9ba076022db76b69d 100755 (executable)
--- 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 \