From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Mar 2009 06:24:46 +0000 (-0700)
Subject: Merge branch 'dm/maint-docco'
X-Git-Tag: v1.6.3-rc0~116
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=88f78ce8433ddf2f498cdcac33fed2c71f820cbd;p=git.git

Merge branch 'dm/maint-docco'

* dm/maint-docco:
  Documentation: reword example text in git-bisect.txt.
  Documentation: reworded the "Description" section of git-bisect.txt.
  Documentation: minor grammatical fixes in git-branch.txt.
  Documentation: minor grammatical fixes in git-blame.txt.
  Documentation: reword the "Description" section of git-bisect.txt.
  Documentation: minor grammatical fixes in git-archive.txt.
---

88f78ce8433ddf2f498cdcac33fed2c71f820cbd
diff --cc Documentation/git-archive.txt
index 0eeefe006,ad38f7f39..c1adf5949
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -48,11 -47,8 +48,11 @@@ OPTION
  --prefix=<prefix>/::
  	Prepend <prefix>/ to each filename in the archive.
  
 +--output=<file>::
 +	Write the archive to <file> instead of stdout.
 +
  <extra>::
- 	This can be any options that the archiver backend understand.
+ 	This can be any options that the archiver backend understands.
  	See next section.
  
  --remote=<repo>::
diff --cc Documentation/git-bisect.txt
index e65c1cae8,ec9594eda..93d9fc029
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@@ -209,14 -214,14 +214,14 @@@ Bisect ru
  ~~~~~~~~~~
  
  If you have a script that can tell if the current source code is good
- or bad, you can automatically bisect using:
+ or bad, you can bisect by issuing the command:
  
  ------------
 -$ git bisect run my_script
 +$ git bisect run my_script arguments
  ------------
  
- Note that the "run" script (`my_script` in the above example) should
- exit with code 0 in case the current source code is good.  Exit with a
+ Note that the script (`my_script` in the above example) should
+ exit with code 0 if the current source code is good, and exit with a
  code between 1 and 127 (inclusive), except 125, if the current
  source code is bad.
  
@@@ -291,22 -289,13 +296,22 @@@ $ git bisect start HEAD HEAD~10 --   # 
  $ git bisect run ~/test.sh
  ------------
  +
- Here "check_test_case.sh" should "exit 0", if the test case passes,
- and "exit 1" (for example) otherwise.
+ Here "check_test_case.sh" should "exit 0" if the test case passes,
+ and "exit 1" otherwise.
  +
- It's safer if both "test.sh" and "check_test_case.sh" scripts are
- outside the repo to prevent interactions between the bisect, make and
- test processes and the scripts.
+ It is safer if both "test.sh" and "check_test_case.sh" scripts are
+ outside the repository to prevent interactions between the bisect,
+ make and test processes and the scripts.
  
 +* Automatically bisect a broken test suite:
 ++
 +------------
 +$ git bisect start HEAD HEAD~10 --   # culprit is among the last 10
 +$ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"
 +------------
 ++
 +Does the same as the previous example, but on a single line.
 +
  Author
  ------
  Written by Linus Torvalds <torvalds@osdl.org>