changeset 363:e70f56fcb80b draft

Merge branch 'master' of git://git1.somerandomnick.ano
author Ivo Smits <Ivo@UCIS.nl>
date Wed, 12 Jan 2011 14:30:04 +0100
parents f316fd5e13bf (current diff) 30b747e3c5d6 (diff)
children c35fdaa5fc48
files
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.gitignore	Wed Jan 12 14:30:04 2011 +0100
@@ -0,0 +1,2 @@
+conf
+export
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/atiti/git	Wed Jan 12 14:30:04 2011 +0100
@@ -0,0 +1,1 @@
+git://1.1.123.1/
--- a/git-commit	Wed Jan 12 14:24:42 2011 +0100
+++ b/git-commit	Wed Jan 12 14:30:04 2011 +0100
@@ -1,4 +1,4 @@
 #!/bin/sh
-git add configure db doc git-commit gitd scripts contrib
+git add configure db doc git-commit gitd scripts contrib .gitignore
 git commit
 test -x /usr/lib/git-core/git-update-server-info && /usr/lib/git-core/git-update-server-info