7 files changed, 19 insertions, 12 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 4ec011c07c3..21194e24a2f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -100,6 +100,8 @@ considered for update.
 
 *** VC has some support for Mercurial (hg).
 
+*** VC has some support for Git.
+
 ** sgml-electric-tag-pair-mode lets you simultaneously edit matched tag pairs.
 
 ** BibTeX mode:
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad836f8ef03..616dfd16859 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-git.el: Relicense to GPLv3 or later.
+        (vc-directory-exclusion-list, vc-handled-backends): Remove.
+        
+        * vc-hooks.el (vc-handled-backends): Add GIT.
+
+        * vc.el (vc-directory-exclusion-list): Add .git.
+
 2007-07-26  Alexandre Julliard  <julliard@winehq.org>
 
         * vc-git.el (vc-git-revision-table)
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 619199fc287..7e358ed0238 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -114,12 +114,6 @@
 (defvar git-commits-coding-system 'utf-8
   "Default coding system for git commits.")
 
-;; XXX when this backend is considered sufficiently reliable this
-;; should be moved to vc-hooks.el
-(add-to-list 'vc-handled-backends 'GIT)
-(eval-after-load "vc"
-  '(add-to-list 'vc-directory-exclusion-list ".git" t))
-
 ;;; BACKEND PROPERTIES
 
 (defun vc-git-revision-granularity ()
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 15238751679..a8b6297caa2 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -62,9 +62,9 @@ interpreted as hostnames."
   :type 'regexp
   :group 'vc)
 
-(defcustom vc-handled-backends '(RCS CVS SVN SCCS BZR HG Arch MCVS)
-  ;; BZR, HG, Arch and MCVS come last because they are per-tree rather
-  ;; than per-dir.
+(defcustom vc-handled-backends '(RCS CVS SVN SCCS BZR GIT HG Arch MCVS)
+  ;; BZR, GIT, HG, Arch and MCVS come last because they are per-tree
+  ;; rather than per-dir.
   "List of version control backends for which VC will be used.
 Entries in this list will be tried in order to determine whether a
 file is under that sort of version control.
diff --git a/lisp/vc.el b/lisp/vc.el
index 47d231eb2c7..08baa16e6b4 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -587,7 +587,7 @@ These are passed to the checkin program by \\[vc-register]."
   :version "20.3")
 
 (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn" 
-                                         ".hg" ".bzr" "{arch}")
+                                         ".git" ".hg" ".bzr" "{arch}")
   "List of directory names to be ignored when walking directory trees."
   :type '(repeat string)
   :group 'vc)
diff --git a/man/ChangeLog b/man/ChangeLog
index c393eb02589..08ba464789a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,7 @@
 2007-07-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * vc2-xtra.texi (Customizing VC): Add GIT.
+
         * dired.texi (Wdired): Mention C-x C-q key binding.
 
 2007-07-25  Glenn Morris  <rgm@gnu.org>
diff --git a/man/vc2-xtra.texi b/man/vc2-xtra.texi
index 7627787d1d2..83f28088726 100644
--- a/man/vc2-xtra.texi
+++ b/man/vc2-xtra.texi
@@ -590,7 +590,7 @@ headers.
 @vindex vc-handled-backends
 The variable @code{vc-handled-backends} determines which version
 control systems VC should handle.  The default value is @code{(RCS CVS
-SVN SCCS BZR HG Arch MCVS)}, so it contains all the version systems
+SVN SCCS BZR GIT HG Arch MCVS)}, so it contains all the version systems
 that are currently supported.  If you want VC to ignore one or more of
 these systems, exclude its name from the list.  To disable VC entirely,
 set this variable to @code{nil}.