diff --git a/man/html/depot_tools.html b/man/html/depot_tools.html index c226e051f..8e78621f4 100644 --- a/man/html/depot_tools.html +++ b/man/html/depot_tools.html @@ -771,14 +771,6 @@ ease the development workflow.

A tutorial for these tools can be found at depot_tools_tutorial(7).

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

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

-
-
git-cl(1)
diff --git a/man/html/git-cherry-pick-upload.html b/man/html/git-cherry-pick-upload.html deleted file mode 100644 index bc3896eef..000000000 --- a/man/html/git-cherry-pick-upload.html +++ /dev/null @@ -1,815 +0,0 @@ - - - - - -git-cherry-pick-upload(1) - - - - - -
-
-

SYNOPSIS

-
-
-
git cherry-pick-upload --branch <remote_branch_name> <commit_hash>
-
-
-
-
-
-

DESCRIPTION

-
-

git cherry-pick-upload 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.

-

The commit message is annotated with "(cherry picked from commit [parent sha1])" -as if it were generated by git cherry-pick -x.

-
-
-
-

EXAMPLE

-
-

$ git cherry-pick-upload -h
-
-$ git cherry-pick-upload -b my_branch c02b7d24a066adb747fdeb12deb21bfa
-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
-

-
-
-
-

SEE ALSO

-
-

git-cherry-pick(1) -git-cl-upload(1)

-
-
-
-

CHROMIUM DEPOT_TOOLS

-
-

Part of the chromium depot_tools(7) suite. These tools are meant to -assist with the development of chromium and related projects. Download the tools -from here.

-
-
-
-
- - - diff --git a/man/man1/git-cherry-pick-upload.1 b/man/man1/git-cherry-pick-upload.1 deleted file mode 100644 index 6ac45aad0..000000000 --- a/man/man1/git-cherry-pick-upload.1 +++ /dev/null @@ -1,80 +0,0 @@ -'\" t -.\" Title: git-cherry-pick-upload -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 12/15/2016 -.\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools f72f1ad -.\" Language: English -.\" -.TH "GIT\-CHERRY\-PICK\-U" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -git-cherry-pick-upload \- Upload the diff between a revision and its parent to rietveld\&. -.SH "SYNOPSIS" -.sp -.nf -\fIgit cherry\-pick\-upload\fR \-\-branch -.fi -.sp -.SH "DESCRIPTION" -.sp -git cherry\-pick\-upload 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\&. -.sp -The commit message is annotated with "(cherry picked from commit [parent sha1])" as if it were generated by git cherry\-pick \-x\&. -.SH "EXAMPLE" -.sp - -.sp -.if n \{\ -.RS 4 -.\} -.nf -\fB$ git cherry\-pick\-upload \-h\fR - -\fB$ git cherry\-pick\-upload \-b my_branch c02b7d24a066adb747fdeb12deb21bfa\fR -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 -.fi -.if n \{\ -.RE -.\} -.sp -.SH "SEE ALSO" -.sp -\fBgit-cherry-pick\fR(1) \fBgit-cl-upload\fR(1) -.SH "CHROMIUM DEPOT_TOOLS" -.sp -Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. -.SH "NOTES" -.IP " 1." 4 -here -.RS 4 -\%https://chromium.googlesource.com/chromium/tools/depot_tools.git -.RE diff --git a/man/man7/depot_tools.7 b/man/man7/depot_tools.7 index 7c89197d5..7d358e9c1 100644 --- a/man/man7/depot_tools.7 +++ b/man/man7/depot_tools.7 @@ -42,11 +42,6 @@ A listing of both categories of tools follows\&. .sp A tutorial for these tools can be found at \fBdepot_tools_tutorial\fR(7)\&. .PP -\fBgit-cherry-pick-upload\fR(1) -.RS 4 -Upload the diff between a revision and its parent to rietveld\&. -.RE -.PP \fBgit-cl\fR(1) .RS 4 Interact with code reviews on Gerrit and Rietveld diff --git a/man/src/_git-cherry-pick-upload_desc.helper.txt b/man/src/_git-cherry-pick-upload_desc.helper.txt deleted file mode 100644 index 8298fa099..000000000 --- a/man/src/_git-cherry-pick-upload_desc.helper.txt +++ /dev/null @@ -1 +0,0 @@ -Upload the diff between a revision and its parent to rietveld. diff --git a/man/src/git-cherry-pick-upload.demo.1.sh b/man/src/git-cherry-pick-upload.demo.1.sh deleted file mode 100755 index d4b395511..000000000 --- a/man/src/git-cherry-pick-upload.demo.1.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -. demo_repo.sh - -run git cherry-pick-upload -h -echo - -pcommand git cherry-pick-upload -b my_branch c02b7d24a066adb747fdeb12deb21bfa -echo 'Found parent revision: b96d69fda53845a205151613a9c4cc93' -echo 'Loaded authentication cookies from .codereview_upload_cookies' -echo 'Issue created. URL: https://codereview.chromium.org/1234567890' -echo ' Uploading base_file for some/path/first.file: OK' -echo ' Uploading some/path/first.file: OK' -echo ' Uploading base_file for some/path/second.file: OK' -echo ' Uploading some/path/second.file: OK' -echo ' Uploading base_file for some/path/third.file: OK' -echo ' Uploading some/path/third.file: OK' -echo 'Finalizing upload: OK' diff --git a/man/src/git-cherry-pick-upload.txt b/man/src/git-cherry-pick-upload.txt deleted file mode 100644 index cf6888e52..000000000 --- a/man/src/git-cherry-pick-upload.txt +++ /dev/null @@ -1,35 +0,0 @@ -git-cherry-pick-upload(1) -========================= - -NAME ----- -git-cherry-pick-upload - -include::_git-cherry-pick-upload_desc.helper.txt[] - -SYNOPSIS --------- -[verse] -'git cherry-pick-upload' --branch - -DESCRIPTION ------------ - -`git cherry-pick-upload` 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. - -The commit message is annotated with "(cherry picked from commit [parent sha1])" -as if it were generated by `git cherry-pick -x`. - -EXAMPLE -------- -demo:1[] - -SEE ALSO --------- -linkgit:git-cherry-pick[1] -linkgit:git-cl-upload[1] - -include::_footer.txt[] - -// vim: ft=asciidoc: