From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 Jun 2007 08:22:10 +0000 (-0700)
Subject: Merge branch 'maint' to sync with GIT 1.5.2.2
X-Git-Tag: v1.5.3-rc0~92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5bd148bfe8a4f2df8487e029cd4ee6809bc4c963;p=git.git

Merge branch 'maint' to sync with GIT 1.5.2.2
---

5bd148bfe8a4f2df8487e029cd4ee6809bc4c963
diff --cc .gitignore
index bd49cd462,b7546a559..e8b060cbe
--- a/.gitignore
+++ b/.gitignore
@@@ -157,9 -156,9 +157,9 @@@ common-cmds.
  *.tar.gz
  *.dsc
  *.deb
- git-core.spec
+ git.spec
  *.exe
 -*.[ao]
 +*.[aos]
  *.py[co]
  config.mak
  autom4te.cache
diff --cc Documentation/git-cvsexportcommit.txt
index 827711c3c,f3590dee0..6c423e3a2
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@@ -73,10 -70,10 +73,10 @@@ Merge one patch into CVS:
  $ export GIT_DIR=~/project/.git
  $ cd ~/project_cvs_checkout
  $ git-cvsexportcommit -v <commit-sha1>
 -$ cvs commit -F .mgs <files> 
 +$ cvs commit -F .mgs <files>
  ------------
  
- Merge pending patches into CVS automatically -- only if you really know what you are doing ::
+ Merge pending patches into CVS automatically -- only if you really know what you are doing::
  +
  ------------
  $ export GIT_DIR=~/project/.git