aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-22 00:10:20 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-22 00:10:20 -0700
commitbdb87afb4b425d97f7b5e957cbed1589969d9a24 (patch)
tree32b46fd09198fa1bc88d793992cfad5dfb6f00ef /contrib
parent799596a5d06f2abddef75940604d00c4bd8ba849 (diff)
parent71bd81ade2973a304889d94426c922cc096019a2 (diff)
downloadgit-bdb87afb4b425d97f7b5e957cbed1589969d9a24.tar.gz
git-bdb87afb4b425d97f7b5e957cbed1589969d9a24.tar.xz
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
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash1
-rw-r--r--contrib/hooks/post-receive-email3
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6012047ee..665a895f5 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -641,6 +641,7 @@ _git_diff ()
--ignore-all-space --exit-code --quiet --ext-diff
--no-ext-diff
--no-prefix --src-prefix= --dst-prefix=
+ --base --ours --theirs
"
return
;;
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index 62a740c48..41368950d 100644
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -202,11 +202,12 @@ generate_email_header()
generate_email_footer()
{
+ SPACE=" "
cat <<-EOF
hooks/post-receive
- --
+ --${SPACE}
$projectdesc
EOF
}