chiark
/
gitweb
/
~mdw
/
stgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9829038
)
Fix the 'status --reset' for individual files
author
Catalin Marinas
<catalin.marinas@gmail.com>
Thu, 19 Jan 2006 15:01:29 +0000
(15:01 +0000)
committer
Catalin Marinas
<catalin.marinas@gmail.com>
Sun, 22 Jan 2006 08:22:23 +0000
(08:22 +0000)
By default, status --reset calls resolved which updates the tree index and
the git-checkout-index -f does not overwrite the files anymore. This patch
explicitely resets the files to the HEAD tree id.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/git.py
patch
|
blob
|
blame
|
history
diff --git
a/stgit/git.py
b/stgit/git.py
index 61436bb8abe19a492d7564d9013a215860f33641..582e803628fb6d10ee058b4c8562f582d735e9ef 100644
(file)
--- a/
stgit/git.py
+++ b/
stgit/git.py
@@
-599,7
+599,7
@@
def switch(tree_id):
__set_head(tree_id)
-def reset(files = None, tree_id =
None
):
+def reset(files = None, tree_id =
'HEAD'
):
"""Revert the tree changes relative to the given tree_id. It removes
any local changes
"""