Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 24 May 2006 10:32:31 +0000 (03:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 May 2006 10:32:31 +0000 (03:32 -0700)
commitf54c76f1616cf470ce4bce8eff749272e1c6548c
treec3dd58a8e23b2028e5c3defde2eae14e42f1e0ca
parent17cf39294af31589b7fed651c11d8beb6ed056bb
parentfad70686b25c414b6224406d42a4dfb7c4136e85
Merge branch 'master' into next

* master:
  --summary output should print immediately after stats.
  git-svn: ignore expansion of svn:keywords
  git-svn: starting a 1.1.0-pre development version
  cvsimport: set up commit environment in perl instead of using env
diff.c