summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-30 14:10:41 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-30 14:10:41 -0700
commit17a02998078923f2d62811326d130de991d1a95a (patch)
treef33b6e5758233f3f7ae05fe0d8565323de381820 /contrib
parent44a9cedb005b0b8be31dccd8e6ddf97074a01345 (diff)
parent806e0aba2e5d976233703e6ff517af10329e4048 (diff)
downloadgit-17a02998078923f2d62811326d130de991d1a95a.tar.gz
Merge branch 'maint'
* maint: contrib/thunderbird-patch-inline: do not require bash to run the script t8001: check the exit status of the command being tested strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead Typos: t/README Documentation/config.txt: make truth value of numbers more explicit git-pack-objects.txt: fix grammatical errors parse-remote: replace unnecessary sed invocation
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/thunderbird-patch-inline/appp.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/thunderbird-patch-inline/appp.sh b/contrib/thunderbird-patch-inline/appp.sh
index cc518f3c89..5eb4a51643 100755
--- a/contrib/thunderbird-patch-inline/appp.sh
+++ b/contrib/thunderbird-patch-inline/appp.sh
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
# Copyright 2008 Lukas Sandström <luksan@gmail.com>
#
# AppendPatch - A script to be used together with ExternalEditor
-# for Mozilla Thunderbird to properly include pathes inline i e-mails.
+# for Mozilla Thunderbird to properly include patches inline in e-mails.
# ExternalEditor can be downloaded at http://globs.org/articles.php?lng=en&pg=2