mirror of
https://github.com/git/git.git
synced 2024-11-18 15:53:54 +01:00
Merge branch 'maint'
* maint: git-gui: Call changes "Staged" and "Unstaged" in file list titles.
This commit is contained in:
commit
f0bc498ec1
@ -1638,7 +1638,7 @@ pack .vpane -anchor n -side top -fill both -expand 1
|
|||||||
# -- Index File List
|
# -- Index File List
|
||||||
#
|
#
|
||||||
frame .vpane.files.index -height 100 -width 200
|
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
|
-background green
|
||||||
text $ui_index -background white -borderwidth 0 \
|
text $ui_index -background white -borderwidth 0 \
|
||||||
-width 20 -height 10 \
|
-width 20 -height 10 \
|
||||||
@ -1658,7 +1658,7 @@ pack $ui_index -side left -fill both -expand 1
|
|||||||
# -- Working Directory File List
|
# -- Working Directory File List
|
||||||
#
|
#
|
||||||
frame .vpane.files.workdir -height 100 -width 200
|
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
|
-background red
|
||||||
text $ui_workdir -background white -borderwidth 0 \
|
text $ui_workdir -background white -borderwidth 0 \
|
||||||
-width 20 -height 10 \
|
-width 20 -height 10 \
|
||||||
|
Loading…
Reference in New Issue
Block a user