man/src/git-cherry-pick-upload.txt - Issue 397593004: Add git cherry picking extension

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: man/src/git-cherry-pick-upload.txt

Issue 397593004: Add git cherry picking extension (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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
(Empty)
	1 git-cherry-pick-upload(1)

	2 =============

	3

	4 NAME

	5 ----

	6 git-cherry-pick-upload -

	7 include::_git-cherry-pick-upload_desc.helper.txt[]

	8

	9 SYNOPSIS

	10 --------

	11 [verse]

	12 'git cherry-pick-upload'
	iannucci 2014/07/29 18:41:35 should have example options here, probably -b <loc should have example options here, probably -b <local_branch_ref> <hash_to_cherry_pick> smut 2014/07/29 22:15:44 Done. Show quoted text On 2014/07/29 18:41:35, iannucci wrote: > should have example options here, probably -b <local_branch_ref> > <hash_to_cherry_pick> Done.
	13

	14 DESCRIPTION

	15 -----------

	16

	17 `git cherry-pick-upload` is used to upload a cherry pick to rietveld. It uses

	18 your view of the remote to generate the diff between a revision and its parent,

	19 and then uploads that diff to rietveld.
	iannucci 2014/07/29 18:41:35 This paragraph is confusing. I think you mean It This paragraph is confusing. I think you mean It cherry-picks '<hash>' onto the specified branch, using your local clone's state of the branch. Because of this, make your local branch ref is up-to-date (using git-fetch) before using this command. Otherwise the CL that this uploads may not apply cleanly to the branch when you try to land it. mebbeh? smut 2014/07/29 22:15:44 It doesn't cherry pick the hash onto anything. It Show quoted text On 2014/07/29 18:41:35, iannucci wrote: > This paragraph is confusing. I think you mean > > It cherry-picks '<hash>' onto the specified branch, using your local clone's > state of the branch. Because of this, make your local branch ref is up-to-date > (using git-fetch) before using this command. Otherwise the CL that this uploads > may not apply cleanly to the branch when you try to land it. > > mebbeh? It doesn't cherry pick the hash onto anything. It finds the parent of the hash, generates the diff, and uploads that diff to rietveld with a modified 'project' parameter.
	20

	21 The commit message is annotated with "(cherry picked from commit [parent sha1])"

	22 as if it were generated by `git cherry-pick -x`.

	23

	24 EXAMPLE

	25 -------

	26 demo:1[]

	27

	28 SEE ALSO

	29 --------

	30 linkgit:git-cherry-pick[1]

	31 linkgit:git-cl-upload[1]

	32

	33 include::_footer.txt[]

	34

	35 // vim: ft=asciidoc:

OLD	NEW

« no previous file with comments | « man/src/_git-cherry-pick-upload_desc.helper.txt ('k') | man/src/git-cherry-pick-upload.demo.1.sh » ('j') | man/src/git-cherry-pick-upload.demo.1.sh » ('J')