Skip to content
Browse files

Autogenerated HTML docs for v1.7.8-rc4

  • Loading branch information...
1 parent 6dfc7fe commit f0944d08eed3d3165aad9cfdcca655836aa8446e @gitster committed
Showing with 60 additions and 37 deletions.
  1. +2 −2 RelNotes/1.7.8.txt
  2. +17 −8 git-cherry-pick.html
  3. +2 −1 git-cherry-pick.txt
  4. +2 −2 git-difftool.html
  5. +1 −1 git-difftool.txt
  6. +5 −5 git-reset.html
  7. +4 −4 git-reset.txt
  8. +17 −8 git-revert.html
  9. +2 −1 git-revert.txt
  10. +8 −5 sequencer.txt
View
4 RelNotes/1.7.8.txt
@@ -29,7 +29,7 @@ Updates since v1.7.7
files from the index, not from the working tree.
* Variants of "git cherry-pick" and "git revert" that take multiple
- commits learned to "--continue".
+ commits learned to "--continue" and "--abort".
* "git daemon" gives more human readble error messages to clients
using ERR packets when appropriate.
@@ -162,7 +162,7 @@ included in this release.
---
exec >/var/tmp/1
-O=v1.7.8-rc3-16-g9e9ab40
+O=v1.7.8-rc4
echo O=$(git describe --always master)
git log --first-parent --oneline --reverse ^$O master
echo
View
25 git-cherry-pick.html
@@ -584,8 +584,9 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<div class="verseblock-content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] &lt;commit&gt;&#8230;
-<em>git cherry-pick</em> --reset
-<em>git cherry-pick</em> --continue</div>
+<em>git cherry-pick</em> --continue
+<em>git cherry-pick</em> --quit
+<em>git cherry-pick</em> --abort</div>
<div class="verseblock-attribution">
</div></div>
</div>
@@ -773,7 +774,17 @@ <h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
---reset
+--continue
+</dt>
+<dd>
+<p>
+ Continue the operation in progress using the information in
+ <em>.git/sequencer</em>. Can be used to continue after resolving
+ conflicts in a failed cherry-pick or revert.
+</p>
+</dd>
+<dt class="hdlist1">
+--quit
</dt>
<dd>
<p>
@@ -783,13 +794,11 @@ <h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
</p>
</dd>
<dt class="hdlist1">
---continue
+--abort
</dt>
<dd>
<p>
- Continue the operation in progress using the information in
- <em>.git/sequencer</em>. Can be used to continue after resolving
- conflicts in a failed cherry-pick or revert.
+ Cancel the operation and return to the pre-sequence state.
</p>
</dd>
</dl></div>
@@ -915,7 +924,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2011-11-30 12:46:15 PDT
</div>
</div>
</body>
View
3 git-cherry-pick.txt
@@ -9,8 +9,9 @@ SYNOPSIS
--------
[verse]
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...
-'git cherry-pick' --reset
'git cherry-pick' --continue
+'git cherry-pick' --quit
+'git cherry-pick' --abort
DESCRIPTION
-----------
View
4 git-difftool.html
@@ -627,7 +627,7 @@ <h2 id="_options">OPTIONS</h2>
<dd>
<p>
Use the diff tool specified by &lt;tool&gt;.
- Valid merge tools are:
+ Valid diff tools are:
araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
</p>
@@ -770,7 +770,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2011-11-30 12:46:15 PDT
</div>
</div>
</body>
View
2 git-difftool.txt
@@ -31,7 +31,7 @@ OPTIONS
-t <tool>::
--tool=<tool>::
Use the diff tool specified by <tool>.
- Valid merge tools are:
+ Valid diff tools are:
araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
+
View
10 git-reset.html
@@ -584,8 +584,8 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<div class="verseblock-content"><em>git reset</em> [-q] [&lt;commit&gt;] [--] &lt;paths&gt;&#8230;
-<em>git reset</em> [--patch|-p] [&lt;commit&gt;] [--] [&lt;paths&gt;&#8230;]
-<em>git reset</em> [--soft | --mixed | --hard | --merge | --keep] [-q] [&lt;commit&gt;]</div>
+<em>git reset</em> (--patch | -p) [&lt;commit&gt;] [--] [&lt;paths&gt;&#8230;]
+<em>git reset</em> (--soft | --mixed | --hard | --merge | --keep) [-q] [&lt;commit&gt;]</div>
<div class="verseblock-attribution">
</div></div>
</div>
@@ -615,7 +615,7 @@ <h2 id="_description">DESCRIPTION</h2>
working tree in one go.</p></div>
</dd>
<dt class="hdlist1">
-<em>git reset</em> --patch|-p [&lt;commit&gt;] [--] [&lt;paths&gt;&#8230;]
+<em>git reset</em> (--patch | -p) [&lt;commit&gt;] [--] [&lt;paths&gt;&#8230;]
</dt>
<dd>
<p>
@@ -628,7 +628,7 @@ <h2 id="_description">DESCRIPTION</h2>
section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div>
</dd>
<dt class="hdlist1">
-<em>git reset</em> [--&lt;mode&gt;] [&lt;commit&gt;]
+<em>git reset</em> --&lt;mode&gt; [&lt;commit&gt;]
</dt>
<dd>
<p>
@@ -1171,7 +1171,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2011-11-30 12:46:15 PDT
</div>
</div>
</body>
View
8 git-reset.txt
@@ -9,8 +9,8 @@ SYNOPSIS
--------
[verse]
'git reset' [-q] [<commit>] [--] <paths>...
-'git reset' [--patch|-p] [<commit>] [--] [<paths>...]
-'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]
+'git reset' (--patch | -p) [<commit>] [--] [<paths>...]
+'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] [<commit>]
DESCRIPTION
-----------
@@ -34,7 +34,7 @@ Alternatively, using linkgit:git-checkout[1] and specifying a commit, you
can copy the contents of a path out of a commit to the index and to the
working tree in one go.
-'git reset' --patch|-p [<commit>] [--] [<paths>...]::
+'git reset' (--patch | -p) [<commit>] [--] [<paths>...]::
Interactively select hunks in the difference between the index
and <commit> (defaults to HEAD). The chosen hunks are applied
in reverse to the index.
@@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.
you can use it to selectively reset hunks. See the ``Interactive Mode''
section of linkgit:git-add[1] to learn how to operate the `\--patch` mode.
-'git reset' [--<mode>] [<commit>]::
+'git reset' --<mode> [<commit>]::
This form resets the current branch head to <commit> and
possibly updates the index (resetting it to the tree of <commit>) and
the working tree depending on <mode>, which
View
25 git-revert.html
@@ -584,8 +584,9 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<div class="verseblock-content"><em>git revert</em> [--edit | --no-edit] [-n] [-m parent-number] [-s] &lt;commit&gt;&#8230;
-<em>git revert</em> --reset
-<em>git revert</em> --continue</div>
+<em>git revert</em> --continue
+<em>git revert</em> --quit
+<em>git revert</em> --abort</div>
<div class="verseblock-attribution">
</div></div>
</div>
@@ -722,7 +723,17 @@ <h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
---reset
+--continue
+</dt>
+<dd>
+<p>
+ Continue the operation in progress using the information in
+ <em>.git/sequencer</em>. Can be used to continue after resolving
+ conflicts in a failed cherry-pick or revert.
+</p>
+</dd>
+<dt class="hdlist1">
+--quit
</dt>
<dd>
<p>
@@ -732,13 +743,11 @@ <h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
</p>
</dd>
<dt class="hdlist1">
---continue
+--abort
</dt>
<dd>
<p>
- Continue the operation in progress using the information in
- <em>.git/sequencer</em>. Can be used to continue after resolving
- conflicts in a failed cherry-pick or revert.
+ Cancel the operation and return to the pre-sequence state.
</p>
</dd>
</dl></div>
@@ -781,7 +790,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2011-11-30 12:46:15 PDT
</div>
</div>
</body>
View
3 git-revert.txt
@@ -9,8 +9,9 @@ SYNOPSIS
--------
[verse]
'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>...
-'git revert' --reset
'git revert' --continue
+'git revert' --quit
+'git revert' --abort
DESCRIPTION
-----------
View
13 sequencer.txt
@@ -1,9 +1,12 @@
---reset::
- Forget about the current operation in progress. Can be used
- to clear the sequencer state after a failed cherry-pick or
- revert.
-
--continue::
Continue the operation in progress using the information in
'.git/sequencer'. Can be used to continue after resolving
conflicts in a failed cherry-pick or revert.
+
+--quit::
+ Forget about the current operation in progress. Can be used
+ to clear the sequencer state after a failed cherry-pick or
+ revert.
+
+--abort::
+ Cancel the operation and return to the pre-sequence state.

0 comments on commit f0944d0

Please sign in to comment.
Something went wrong with that request. Please try again.