Merge from emacs-23

[bpt/emacs.git] / lisp / vc / vc-git.el

diff --git a/lisp/vc-git.el b/lisp/vc/vc-git.el
similarity index 99%
rename from lisp/vc-git.el
rename to lisp/vc/vc-git.el
index b9b63ce..6d3a699 100644 (file)
--- a/lisp/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -3,7 +3,8 @@
 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Alexandre Julliard <julliard@winehq.org>
-;; Keywords: tools
+;; Keywords: vc tools
+;; Package: vc
 
 ;; This file is part of GNU Emacs.
 
@@ -629,7 +630,7 @@ for the --graph option."
   (vc-git-command nil 0 nil "fetch")
   (vc-git-command
    buffer 0 nil
-   "log"
+   "log" 
    "--no-color" "--graph" "--decorate" "--date=short"
    "--pretty=tformat:%d%h  %ad  %s" "--abbrev-commit"
    (concat "HEAD.." (if (string= remote-location "")