From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Apr 2008 07:10:20 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~127
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bdb87afb4b425d97f7b5e957cbed1589969d9a24;p=git.git

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
---

bdb87afb4b425d97f7b5e957cbed1589969d9a24