From: Junio C Hamano Date: Wed, 9 Mar 2011 22:20:39 +0000 (-0800) Subject: Merge branch 'maint' X-Git-Tag: v1.7.5-rc0~91 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/31f4da593b6d41e7c5f496542ffeca776c3fc223?hp=f7c6c426ca193773c6a9879d33a3d6f7d835bc8d Merge branch 'maint' * maint: Fix typo in t/README ls-remote documentation: argument is optional Add Author and Documentation sections to git-for-each-ref.txt Documentation: remove redundant colons in git-for-each-ref.txt --- diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index fac1cf55e5..152e695c81 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -123,7 +123,7 @@ EXAMPLES -------- An example directly producing formatted text. Show the most recent -3 tagged commits:: +3 tagged commits: ------------ #!/bin/sh @@ -140,7 +140,7 @@ Ref: %(*refname) A simple example showing the use of shell eval on the output, -demonstrating the use of --shell. List the prefixes of all heads:: +demonstrating the use of --shell. List the prefixes of all heads: ------------ #!/bin/sh @@ -154,7 +154,7 @@ done A bit more elaborate report on tags, demonstrating that the format -may be an entire script:: +may be an entire script: ------------ #!/bin/sh @@ -204,3 +204,15 @@ eval=`git for-each-ref --shell --format="$fmt" \ refs/tags` eval "$eval" ------------ + +Author +------ +Written by Junio C Hamano . + +Documentation +------------- +Documentation by Junio C Hamano and the git-list . + +GIT +--- +Part of the linkgit:git[1] suite diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index abe7bf9ff9..3422765827 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git ls-remote' [--heads] [--tags] [-u | --upload-pack ] - ... + [...] DESCRIPTION ----------- diff --git a/t/README b/t/README index 25f7d2d2e3..78c9e6575c 100644 --- a/t/README +++ b/t/README @@ -328,7 +328,7 @@ Keep in mind: Skipping tests -------------- -If you need to skip tests you should do so be using the three-arg form +If you need to skip tests you should do so by using the three-arg form of the test_* functions (see the "Test harness library" section below), e.g.: