From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Mar 2011 04:38:15 +0000 (-0700)
Subject: Merge branch 'mg/doc-bisect-tweak-worktree'
X-Git-Tag: v1.7.5-rc0~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b350f7797c43ae488fb6d4d0faaa08e931445b2d;p=git.git

Merge branch 'mg/doc-bisect-tweak-worktree'

* mg/doc-bisect-tweak-worktree:
  git-bisect.txt: example for bisecting with hot-fix
  git-bisect.txt: streamline run presentation
---

b350f7797c43ae488fb6d4d0faaa08e931445b2d
diff --cc Documentation/git-bisect.txt
index 4b4b096ce,989e2238d..7b7bafba0
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@@ -325,8 -334,17 +339,9 @@@ $ git bisect start HEAD HEAD~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.
+ This shows that you can do without a run script if you write the test
+ on a single line.
  
 -Author
 -------
 -Written by Linus Torvalds <torvalds@osdl.org>
 -
 -Documentation
 --------------
 -Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 -
  SEE ALSO
  --------
  link:git-bisect-lk2009.html[Fighting regressions with git bisect],