From: Junio C Hamano <junkio@cox.net>
Date: Wed, 18 Apr 2007 23:17:28 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc0~33
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6fb8e8f401a065bdffe379764871551e37a041a0;p=git.git

Merge branch 'maint'

* maint:
  git-shortlog: Fix two formatting errors in asciidoc documentation
  Fix overwriting of files when applying contextually independent diffs
  git-svn: don't allow globs to match regular files
---

6fb8e8f401a065bdffe379764871551e37a041a0