diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-03-01 18:42:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-03-01 18:42:18 +0000 |
| commit | 69a98586dace45994f1eeeee63cf19d056bfc561 (patch) | |
| tree | 2467dc03f038a24810150429a362942d86bff9b5 /git-cherry-pick.html | |
| parent | 40f54d31bd2b56b128e9f450b3830133e999b382 (diff) | |
| download | git-htmldocs-69a98586dace45994f1eeeee63cf19d056bfc561.tar.gz | |
Autogenerated HTML docs for v1.5.4.3-365-gc149
Diffstat (limited to 'git-cherry-pick.html')
| -rw-r--r-- | git-cherry-pick.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index e82deb9d6..fe88297cb 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -335,7 +335,7 @@ modifications from the HEAD commit).</p> </dt>
<dd>
<p>
- Usually you cannot revert a merge because you do not know which
+ Usually you cannot cherry-pick a merge because you do not know which
side of the merge should be considered the mainline. This
option specifies the parent number (starting from 1) of
the mainline and allows cherry-pick to replay the change
@@ -375,7 +375,7 @@ effect to your working tree in a row.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 21-Jan-2008 02:37:25 UTC
+Last updated 01-Mar-2008 18:41:39 UTC
</div>
</div>
</body>
|