From 8812e0b82500c823b60f9e0fe53027f0928318dd Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Sun, 9 Jun 2013 17:10:58 -0700 Subject: 31466: Cause git and cvs to ignore one another, in case anyone wants to import this tree into a CVS repository. --- .cvsignore | 1 + .gitignore | 3 +++ ChangeLog | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/.cvsignore b/.cvsignore index 971a308be..95cdc587b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -13,3 +13,4 @@ stamp-h stamp-h.in autom4te.cache *.swp +.git diff --git a/.gitignore b/.gitignore index 19d5640d1..d0172e39b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,9 @@ TAGS Config/defs.mk +CVS +.#* + Doc/intro.a4.pdf Doc/intro.a4.ps Doc/intro.us.pdf diff --git a/ChangeLog b/ChangeLog index 87a64b835..0bf13d2a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-06-09 Barton E. Schaefer + + * 31466: .cvsignore, .gitignore: Cause git and cvs to ignore + one another. + 2013-06-01 Peter Stephenson * 31441: Src/glob.c, Src/pattern.c, Src/zsh.h: use an array -- cgit 1.4.1