Commit 6a6d15ab authored by Mark A. Hershberger's avatar Mark A. Hershberger
Browse files

merge

parents d9de6d6f 504dcc71
......@@ -328,6 +328,8 @@ their content displayed.
**** 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.
......
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.
......
......@@ -381,7 +381,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(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))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment