Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Fix typo in t/README
  ls-remote documentation: <refs> argument is optional
  Add Author and Documentation sections to git-for-each-ref.txt
  Documentation: remove redundant colons in git-for-each-ref.txt
  • Loading branch information
Junio C Hamano committed Mar 9, 2011
2 parents f7c6c42 + 681186a commit 31f4da5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
18 changes: 15 additions & 3 deletions Documentation/git-for-each-ref.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ EXAMPLES
--------

An example directly producing formatted text. Show the most recent
3 tagged commits::
3 tagged commits:

------------
#!/bin/sh
Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -204,3 +204,15 @@ eval=`git for-each-ref --shell --format="$fmt" \
refs/tags`
eval "$eval"
------------

Author
------
Written by Junio C Hamano <gitster@pobox.com>.

Documentation
-------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.

GIT
---
Part of the linkgit:git[1] suite
2 changes: 1 addition & 1 deletion Documentation/git-ls-remote.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git ls-remote' [--heads] [--tags] [-u <exec> | --upload-pack <exec>]
<repository> <refs>...
<repository> [<refs>...]

DESCRIPTION
-----------
Expand Down
2 changes: 1 addition & 1 deletion t/README
Original file line number Diff line number Diff line change
Expand Up @@ -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.:

Expand Down

0 comments on commit 31f4da5

Please sign in to comment.