Mercurial > emacs
changeset 106984:61edd42cf483
merge
| author | Mark A. Hershberger <mhershberger@intrahealth.org> |
|---|---|
| date | Mon, 25 Jan 2010 00:03:35 -0500 |
| parents | 38312121c181 (current diff) 36d87e3f3cc3 (diff) |
| children | e9c454218ac8 |
| files | lisp/ChangeLog |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Mon Jan 25 00:02:10 2010 -0500 +++ b/etc/NEWS Mon Jan 25 00:03:35 2010 -0500 @@ -328,6 +328,8 @@ **** vc-dir displays the stash status +**** vc-dir requires at least git-1.5.5. + *** vc-bzr supports operating with shelves: the shelve list is displayed in the *vc-dir* header, shelves can be created, removed and applied.
--- a/lisp/ChangeLog Mon Jan 25 00:02:10 2010 -0500 +++ b/lisp/ChangeLog Mon Jan 25 00:03:35 2010 -0500 @@ -1,10 +1,15 @@ -2010-01-24 Mark A. Hershberger <mah@everybody.org> +2010-01-25 Mark A. Hershberger <mah@everybody.org> * progmodes/python.el: Replace reference to obsolete c-subward-mode. * vc-bzr.el: (vc-bzr-revision-table) New function. +2010-01-25 Eric Hanchrow <eric.hanchrow@gmail.com> (tiny change) + + * vc-git.el (vc-git-dir-status-goto-stage): Pass --relative to the + diff-index command. This requires at least git-1.5.5. (Bug#1589). + 2010-01-24 Dan Nicolaescu <dann@ics.uci.edu> Remove support for adding --signoff on commit.
--- a/lisp/vc-git.el Mon Jan 25 00:02:10 2010 -0500 +++ b/lisp/vc-git.el Mon Jan 25 00:03:35 2010 -0500 @@ -381,7 +381,7 @@ (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" "-i" "--directory" "--no-empty-directory" "--exclude-standard" "--")) ('diff-index - (vc-git-command (current-buffer) 'async files "diff-index" "-z" "-M" "HEAD" "--"))) + (vc-git-command (current-buffer) 'async files "diff-index" "--relative" "-z" "-M" "HEAD" "--"))) (vc-exec-after `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote ,update-function))))