diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-git.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 712507bcea3..38a9a1c0817 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-12-06 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | Make vc-revert change VC state from 'added to 'unregistered. | ||
| 4 | * vc-git.el (vc-git-revert): Call git reset first. | ||
| 5 | |||
| 1 | 2009-12-06 Ulf Jasper <ulf.jasper@web.de> | 6 | 2009-12-06 Ulf Jasper <ulf.jasper@web.de> |
| 2 | 7 | ||
| 3 | * net/newst-backend.el : | 8 | * net/newst-backend.el : |
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index a33a0f51d7d..f44679d4333 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el | |||
| @@ -535,7 +535,8 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 535 | "Revert FILE to the version stored in the git repository." | 535 | "Revert FILE to the version stored in the git repository." |
| 536 | (if contents-done | 536 | (if contents-done |
| 537 | (vc-git-command nil 0 file "update-index" "--") | 537 | (vc-git-command nil 0 file "update-index" "--") |
| 538 | (vc-git-command nil 0 file "checkout" "HEAD"))) | 538 | (vc-git-command nil 0 file "reset" "-q" "--") |
| 539 | (vc-git-command nil nil file "checkout" "-q" "--"))) | ||
| 539 | 540 | ||
| 540 | ;;; HISTORY FUNCTIONS | 541 | ;;; HISTORY FUNCTIONS |
| 541 | 542 | ||