Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-gui: Correct some state matchings for include/remove.
author
Shawn O. Pearce
<spearce@spearce.org>
Sun, 19 Nov 2006 08:46:29 +0000
(
03:46
-0500)
committer
Shawn O. Pearce
<spearce@spearce.org>
Sun, 19 Nov 2006 08:46:29 +0000
(
03:46
-0500)
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
a29481e
)
diff --git
a/git-gui
b/git-gui
index dcb25c8d69665f28070cf40378c63d55504e2a2e..dcbb100feb8abbdba734683ceeae7de0ade8560e 100755
(executable)
--- a/
git-gui
+++ b/
git-gui
@@
-1676,6
+1676,7
@@
foreach i {
{DO i removed "Removed (still exists)"}
{DM i removed "Removed (but modified)"}
+ {UD i merge "Merge conflicts"}
{UM i merge "Merge conflicts"}
{U_ i merge "Merge conflicts"}
} {
@@
-2033,12
+2034,11
@@
proc include_helper {txt paths} {
set pathList [list]
set after {}
foreach path $paths {
- switch -- [lindex $file_states($path) 0] {
+ switch -
glob -
- [lindex $file_states($path) 0] {
AM -
AD -
MM -
- UM -
- U_ -
+ U? -
_M -
_D -
_O {
@@
-2437,7
+2437,8
@@
proc toggle_or_diff {w x y} {
A_ -
M_ -
DD -
- D_ {
+ DO -
+ DM {
update_indexinfo \
"Removing [short_path $path] from commit" \
[list $path] \