| Index: man/html/git-cherry-pick-upload.html
|
| diff --git a/man/html/git-mark-merge-base.html b/man/html/git-cherry-pick-upload.html
|
| similarity index 88%
|
| copy from man/html/git-mark-merge-base.html
|
| copy to man/html/git-cherry-pick-upload.html
|
| index 9e6f4e0c57c16527c323f3bcca525d2e07071093..b212bd4107e1bc7fc1f372a16aa53aece6869695 100644
|
| --- a/man/html/git-mark-merge-base.html
|
| +++ b/man/html/git-cherry-pick-upload.html
|
| @@ -4,7 +4,7 @@
|
| <head>
|
| <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
|
| <meta name="generator" content="AsciiDoc 8.6.9" />
|
| -<title>git-mark-merge-base(1)</title>
|
| +<title>git-cherry-pick-upload(1)</title>
|
| <style type="text/css">
|
| /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
|
|
|
| @@ -741,12 +741,12 @@ asciidoc.install();
|
| <body class="manpage">
|
| <div id="header">
|
| <h1>
|
| -git-mark-merge-base(1) Manual Page
|
| +git-cherry-pick-upload(1) Manual Page
|
| </h1>
|
| <h2>NAME</h2>
|
| <div class="sectionbody">
|
| -<p>git-mark-merge-base -
|
| - Manually interact with depot_tools' merge-base markers.
|
| +<p>git-cherry-pick-upload -
|
| + Upload the diff between a revision and its parent to rietveld.
|
| </p>
|
| </div>
|
| </div>
|
| @@ -755,9 +755,7 @@ git-mark-merge-base(1) Manual Page
|
| <h2 id="_synopsis">SYNOPSIS</h2>
|
| <div class="sectionbody">
|
| <div class="verseblock">
|
| -<pre class="content"><em>git mark-merge-base</em>
|
| -<em>git mark-merge-base</em> <commit hash>
|
| -<em>git mark-merge-base</em> [-d | --delete]</pre>
|
| +<pre class="content"><em>git cherry-pick-upload --branch <remote_branch_name> <commit_hash></em></pre>
|
| <div class="attribution">
|
| </div></div>
|
| </div>
|
| @@ -765,46 +763,46 @@ git-mark-merge-base(1) Manual Page
|
| <div class="sect1">
|
| <h2 id="_description">DESCRIPTION</h2>
|
| <div class="sectionbody">
|
| -<div class="paragraph"><p>Inspect, set or delete the current merge-base marker for the current branch.
|
| -This should not be needed, but is useful if things get into a snarled state.
|
| -Pass no arguments to view the current value. If you provide <commit hash>, then
|
| -<code>git mark-merge-base</code> will attempt to set that as the merge-base value.</p></div>
|
| -<div class="paragraph"><p>It is invalid to pick a commit which is not an ancestor of the current branch.</p></div>
|
| -<div class="paragraph"><p>See <a href="git-rebase-update.html">git-rebase-update(1)</a>'s description of the <code>branch.<name>.base</code>
|
| -configuration variable for more info on what the merge base markers are for.</p></div>
|
| +<div class="paragraph"><p><code>git cherry-pick-upload</code> is used to upload a cherry pick to rietveld. It uses
|
| +your view of the remote to generate the diff between a revision and its parent,
|
| +and then uploads that diff to rietveld.</p></div>
|
| +<div class="paragraph"><p>The commit message is annotated with "(cherry picked from commit [parent sha1])"
|
| +as if it were generated by <code>git cherry-pick -x</code>.</p></div>
|
| </div>
|
| </div>
|
| <div class="sect1">
|
| -<h2 id="_options">OPTIONS</h2>
|
| +<h2 id="_example">EXAMPLE</h2>
|
| <div class="sectionbody">
|
| -<div class="dlist"><dl>
|
| -<dt class="hdlist1">
|
| --d
|
| -</dt>
|
| -<dt class="hdlist1">
|
| ---delete
|
| -</dt>
|
| -<dd>
|
| -<p>
|
| - Delete the merge-base marker for the current branch.
|
| -</p>
|
| -</dd>
|
| -<dt class="hdlist1">
|
| -<commit hash>
|
| -</dt>
|
| -<dd>
|
| -<p>
|
| - The new value to set for the current branch’s merge-base marker.
|
| -</p>
|
| -</dd>
|
| -</dl></div>
|
| +<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git cherry-pick-upload -h</span>
|
| +usage: git_cherry_pick_upload.py [-h] --branch <branch> <commit>
|
| +
|
| +positional arguments:
|
| + <commit> SHA to cherry pick.
|
| +
|
| +optional arguments:
|
| + -h, --help show this help message and exit
|
| + --branch <branch>, -b <branch>
|
| + The upstream branch to cherry pick to.
|
| +
|
| +<span style="font-weight: bold; color: #ffffff">$ git cherry-pick-upload -b my_branch c02b7d24a066adb747fdeb12deb21bfa</span>
|
| +Found parent revision: b96d69fda53845a205151613a9c4cc93
|
| +Loaded authentication cookies from .codereview_upload_cookies
|
| +Issue created. URL: https://codereview.chromium.org/1234567890
|
| + Uploading base_file for some/path/first.file: OK
|
| + Uploading some/path/first.file: OK
|
| + Uploading base_file for some/path/second.file: OK
|
| + Uploading some/path/second.file: OK
|
| + Uploading base_file for some/path/third.file: OK
|
| + Uploading some/path/third.file: OK
|
| +Finalizing upload: OK
|
| +</code></pre></div></div><p><div class="paragraph"></p></div>
|
| </div>
|
| </div>
|
| <div class="sect1">
|
| <h2 id="_see_also">SEE ALSO</h2>
|
| <div class="sectionbody">
|
| -<div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)</a>, <a href="git-reparent-branch.html">git-reparent-branch(1)</a>,
|
| -<a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream-diff.html">git-upstream-diff(1)</a></p></div>
|
| +<div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>
|
| +<a href="git-cl-upload.html">git-cl-upload(1)</a></p></div>
|
| </div>
|
| </div>
|
| <div class="sect1">
|
| @@ -819,7 +817,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
| <div id="footnotes"><hr /></div>
|
| <div id="footer">
|
| <div id="footer-text">
|
| -Last updated 2014-04-10 14:23:11 PDT
|
| +Last updated 2014-07-23 14:38:36 PDT
|
| </div>
|
| </div>
|
| </body>
|
|
|
Chromium Code Reviews
Issue 397593004:
Add git cherry picking extension (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools