diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:04 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:04 +0900 |
| commit | d9f5ea42ff04432d2e41c3d3d7d97a1eabe4f4f5 (patch) | |
| tree | 1b66d7da9179b0c29649e9573e631eb07dc9bd40 | |
| parent | Merge branch 'jc/merge-x-theirs-docfix' into maint (diff) | |
| parent | request-pull: capitalise "Git" to make it a proper noun (diff) | |
| download | tgif-d9f5ea42ff04432d2e41c3d3d7d97a1eabe4f4f5.tar.xz | |
Merge branch 'ar/request-pull-phrasofix' into maint
Spell the name of our system as "Git" in the output from
request-pull script.
* ar/request-pull-phrasofix:
request-pull: capitalise "Git" to make it a proper noun
| -rwxr-xr-x | git-request-pull.sh | 2 | ||||
| -rwxr-xr-x | t/t5150-request-pull.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh index eebd33276d..13c172bd94 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -128,7 +128,7 @@ git show -s --format='The following changes since commit %H: %s (%ci) -are available in the git repository at: +are available in the Git repository at: ' $merge_base && echo " $url $pretty_remote" && git show -s --format=' diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh index 82c33b88e7..08c210f035 100755 --- a/t/t5150-request-pull.sh +++ b/t/t5150-request-pull.sh @@ -68,7 +68,7 @@ test_expect_success 'setup: two scripts for reading pull requests' ' cat <<-\EOT >read-request.sed && #!/bin/sed -nf # Note that a request could ask for "tag $tagname" - / in the git repository at:$/!d + / in the Git repository at:$/!d n /^$/ n s/ tag \([^ ]*\)$/ tag--\1/ @@ -192,7 +192,7 @@ test_expect_success 'pull request format' ' SUBJECT (DATE) - are available in the git repository at: + are available in the Git repository at: URL BRANCH |