Merge branch 'maint'
commitbdb87afb4b425d97f7b5e957cbed1589969d9a24
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Apr 2008 07:10:20 +0000 (22 00:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Apr 2008 07:10:20 +0000 (22 00:10 -0700)
tree32b46fd09198fa1bc88d793992cfad5dfb6f00ef
parent799596a5d06f2abddef75940604d00c4bd8ba849
parent71bd81ade2973a304889d94426c922cc096019a2
Merge branch 'maint'

* maint:
  post-receive-email: fix accidental removal of a trailing space in signature line
  Escape project names before creating pathinfo URLs
  Escape project name in regexp
  bash: Add completion for git diff --base --ours --theirs
  diff-options.txt: document the new "--dirstat" option
contrib/completion/git-completion.bash
gitweb/gitweb.perl