Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Autogenerated HTML docs for v1.8.1.3-605-g0233

  • Loading branch information...
commit 97cc08f5827dea14476b5c0c9a6acb89945e87aa 1 parent bca4cd6
@gitster authored
Showing with 28 additions and 8 deletions.
  1. +9 −0 RelNotes/1.8.2.txt
  2. +13 −7 git-bisect.html
  3. +6 −1 git-bisect.txt
View
9 RelNotes/1.8.2.txt
@@ -115,6 +115,9 @@ UI, Workflows & Features
rewrite the names and email addresses of people using the mailmap
mechanism.
+ * "git log --cc --graph" now shows the combined diff output with the
+ ancestry graph.
+
* "git mergetool" and "git difftool" learned to list the available
tool backends in a more consistent manner.
@@ -144,6 +147,9 @@ UI, Workflows & Features
you do not have any commits in your history, but it now gives you
an empty index (to match non-existent commit you are not even on).
+ * "git status" says what branch is being bisected or rebased when
+ able, not just "bisecting" or "rebasing".
+
* "git submodule" started learning a new mode to integrate with the
tip of the remote branch (as opposed to integrating with the commit
recorded in the superproject's gitlink).
@@ -295,6 +301,9 @@ details).
failed to remove the real location of the $GIT_DIR it created.
This was most visible when interrupting a submodule update.
+ * "git cvsimport" mishandled timestamps at DST boundary.
+ (merge 48c9162 bw/get-tz-offset-perl later to maint).
+
* We used to have an arbitrary 32 limit for combined diff input,
resulting in incorrect number of leading colons shown when showing
the "--raw --cc" output.
View
20 git-bisect.html
@@ -816,7 +816,7 @@ <h3 id="_basic_bisect_commands_start_bad_good">Basic bisect commands: start, bad
<div class="sect2">
<h3 id="_bisect_reset">Bisect reset</h3>
<div class="paragraph"><p>After a bisect session, to clean up the bisection state and return to
-the original HEAD, issue the following command:</p></div>
+the original HEAD (i.e., to quit bisecting), issue the following command:</p></div>
<div class="listingblock">
<div class="content">
<pre><code>$ git bisect reset</code></pre>
@@ -1001,7 +1001,8 @@ <h2 id="_examples">EXAMPLES</h2>
<div class="listingblock">
<div class="content">
<pre><code>$ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good
-$ git bisect run make # "make" builds the app</code></pre>
+$ git bisect run make # "make" builds the app
+$ git bisect reset # quit the bisect session</code></pre>
</div></div>
</li>
<li>
@@ -1011,7 +1012,8 @@ <h2 id="_examples">EXAMPLES</h2>
<div class="listingblock">
<div class="content">
<pre><code>$ git bisect start HEAD origin -- # HEAD is bad, origin is good
-$ git bisect run make test # "make test" builds and tests</code></pre>
+$ git bisect run make test # "make test" builds and tests
+$ git bisect reset # quit the bisect session</code></pre>
</div></div>
</li>
<li>
@@ -1025,7 +1027,8 @@ <h2 id="_examples">EXAMPLES</h2>
make || exit 125 # this skips broken builds
~/check_test_case.sh # does the test case pass?
$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10
-$ git bisect run ~/test.sh</code></pre>
+$ git bisect run ~/test.sh
+$ git bisect reset # quit the bisect session</code></pre>
</div></div>
<div class="paragraph"><p>Here we use a "test.sh" custom script. In this script, if "make"
fails, we skip the current commit.
@@ -1077,7 +1080,8 @@ <h2 id="_examples">EXAMPLES</h2>
<div class="listingblock">
<div class="content">
<pre><code>$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10
-$ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"</code></pre>
+$ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"
+$ git bisect reset # quit the bisect session</code></pre>
</div></div>
<div class="paragraph"><p>This shows that you can do without a run script if you write the test
on a single line.</p></div>
@@ -1095,7 +1099,9 @@ <h2 id="_examples">EXAMPLES</h2>
git pack-objects --stdout &gt;/dev/null &lt;tmp.$$
rc=$?
rm -f tmp.$$
- test $rc = 0'</code></pre>
+ test $rc = 0'
+
+$ git bisect reset # quit the bisect session</code></pre>
</div></div>
<div class="paragraph"><p>In this case, when <em>git bisect run</em> finishes, bisect/bad will refer to a commit that
has at least one parent whose reachable graph is fully traversable in the sense
@@ -1121,7 +1127,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-02-14 13:10:12 PST
</div>
</div>
</body>
View
7 git-bisect.txt
@@ -83,7 +83,7 @@ Bisect reset
~~~~~~~~~~~~
After a bisect session, to clean up the bisection state and return to
-the original HEAD, issue the following command:
+the original HEAD (i.e., to quit bisecting), issue the following command:
------------------------------------------------
$ git bisect reset
@@ -284,6 +284,7 @@ EXAMPLES
------------
$ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good
$ git bisect run make # "make" builds the app
+$ git bisect reset # quit the bisect session
------------
* Automatically bisect a test failure between origin and HEAD:
@@ -291,6 +292,7 @@ $ git bisect run make # "make" builds the app
------------
$ git bisect start HEAD origin -- # HEAD is bad, origin is good
$ git bisect run make test # "make test" builds and tests
+$ git bisect reset # quit the bisect session
------------
* Automatically bisect a broken test case:
@@ -302,6 +304,7 @@ make || exit 125 # this skips broken builds
~/check_test_case.sh # does the test case pass?
$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10
$ git bisect run ~/test.sh
+$ git bisect reset # quit the bisect session
------------
+
Here we use a "test.sh" custom script. In this script, if "make"
@@ -351,6 +354,7 @@ use `git cherry-pick` instead of `git merge`.)
------------
$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10
$ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"
+$ git bisect reset # quit the bisect session
------------
+
This shows that you can do without a run script if you write the test
@@ -368,6 +372,7 @@ $ git bisect run sh -c '
rm -f tmp.$$
test $rc = 0'
+$ git bisect reset # quit the bisect session
------------
+
In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that
Please sign in to comment.
Something went wrong with that request. Please try again.