Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 23:17:28 +0000 (16:17 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 18 Apr 2007 23:17:28 +0000 (16:17 -0700)
commit6fb8e8f401a065bdffe379764871551e37a041a0
tree96f41d575c40cecd61f20254c327c3a03fc7044b
parentabbf594763a14e9c00c61f688e45bed636f1eb52
parent0ad64fd0b8d073e0c73836858a54f693c9191918
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
builtin-apply.c