mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git-gui 0.14.0

Browse Source
This commit is contained in:
Junio C Hamano
2011-03-26 10:42:26 -07:00
parent 421446b6fc fbc9629e2f
commit 42f9874573
14 changed files with 3383 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
git-gui/lib/index.tcl
View File

@ -103,8 +103,11 @@ proc write_update_indexinfo {fd pathList totalCnt batch after} {
set s $file_states($path)
switch -glob -- [lindex $s 0] {
A? {set new _O}
M? {set new _M}
MT -
TM -
T_ {set new _T}
M? {set new _M}
TD -
D_ {set new _D}
D? {set new _?}
?? {continue}
@ -167,7 +170,10 @@ proc write_update_index {fd pathList totalCnt batch after} {
AD {set new __}
?D {set new D_}
_O -
AT -
AM {set new A_}
TM -
MT -
_T {set new T_}
_U -
U? {
@ -261,7 +267,7 @@ proc unstage_helper {txt paths} {
switch -glob -- [lindex $file_states($path) 0] {
A? -
M? -
T_ -
T? -
D? {
lappend pathList $path
if {$path eq $current_diff_path} {