man/html/git-drover.html - Issue 494873003: Add stub git-drover documentation.

Unified Diff: man/html/git-drover.html

Issue 494873003: Add stub git-drover documentation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: man/html/git-drover.html

diff --git a/man/html/git-cherry-pick-upload.html b/man/html/git-drover.html

similarity index 88%

copy from man/html/git-cherry-pick-upload.html

copy to man/html/git-drover.html

index 58b42e8f19769fb94b9d20a43b34ff1352c1a1ba..2fc3ac000330bc4a6c70482ee7ccf0b68aff334a 100644

--- a/man/html/git-cherry-pick-upload.html

+++ b/man/html/git-drover.html

@@ -4,7 +4,7 @@

<head>

-<title>git-cherry-pick-upload(1)</title>

+<title>git-drover(1)</title>

/* Shared CSS for AsciiDoc xhtml11 and html5 backends */

@@ -741,12 +741,12 @@ asciidoc.install();

<h1>

-git-cherry-pick-upload(1) Manual Page

+git-drover(1) Manual Page

</h1>

-<p>git-cherry-pick-upload -

- Upload the diff between a revision and its parent to rietveld.

+<p>git-drover -

+ Apply a commit from the trunk to a release branch, or from one release branch to another.

</p>

</div>

@@ -755,7 +755,7 @@ git-cherry-pick-upload(1) Manual Page

<h2 id="_synopsis">SYNOPSIS</h2>

-<pre class="content"><em>git cherry-pick-upload</em> --branch <remote_branch_name> <commit_hash></pre>

+<pre class="content"><em>git drover</em></pre>

</div></div>

</div>

@@ -763,46 +763,50 @@ git-cherry-pick-upload(1) Manual Page

<h2 id="_description">DESCRIPTION</h2>

-<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 class="paragraph"><p><code>git drover</code> is NOT IMPLEMENTED yet. See the EXAMPLE section for the equivalent

+sequence of commands to run.</p></div>

</div>

<h2 id="_example">EXAMPLE</h2>

-<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

+<div class="paragraph"><p> Before working with branches, you must 'gclient sync --with_branch_heads' at least once to fetch the branches.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>

+commit 49fde8547a38bf27d38cbf3fac783cdf2ddc5f47

+Author: some.committer <some.committer@chromium.org>

+AuthorDate: Thu Apr 10 08:54:46 2014 +0000

+Commit: some.committer <some.committer@chromium.org>

+CommitDate: Thu Apr 10 08:54:46 2014 +0000

+ This change needs to go to branch 9999

+<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>

+Branch drover_9999 set up to track remote ref refs/branch-heads/9999.

+# DO NOT leave off the '-x' flag

+<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 49fde8547a38bf27d38cbf3fac783cdf2ddc5f47</span>

+[drover_9999 1e33c2c] This change needs to go to branch 9999

+ Author: some.committer <some.committer@chromium.org>

+ Date: Thu Apr 10 08:54:46 2014 +0000

+ 1 file changed, 1 insertion(+)

+ create mode 100644 modified_file

+<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>

+commit 1e33c2ccf642703a6c1c582210fe63980dc6c45b

+Author: some.committer <some.committer@chromium.org>

+AuthorDate: Thu Apr 10 08:54:46 2014 +0000

+Commit: branch.maintainer <branch.maintainer@chromium.org>

+CommitDate: Thu Apr 10 09:11:36 2014 +0000

+ This change needs to go to branch 9999

+ (cherry picked from commit 49fde8547a38bf27d38cbf3fac783cdf2ddc5f47)

+<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>

+# Get LGTM or TBR.

+<span style="font-weight: bold; color: #ffffff">$ git cl land</span>

</code></pre></div></div><p><div class="paragraph"></p></div>

</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 class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a></p></div>

</div>

@@ -817,7 +821,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">

-Last updated 2014-08-20 09:39:48 PDT

+Last updated 2014-08-20 16:12:01 PDT

</div>

</body>

« no previous file with comments | « no previous file | man/man1/git-drover.1 » ('j') | no next file with comments »