Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: man/man1/git-drover.1

Issue 2170623003: Update docs with latest changes (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools@asciidoc
Patch Set: Created 4 years, 5 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
« no previous file with comments | « man/man1/git-cherry-pick-upload.1 ('k') | man/man1/git-footers.1 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: man/man1/git-drover.1
diff --git a/man/man1/git-drover.1 b/man/man1/git-drover.1
index 82744a2dd196fb96aac7d9888ed2b06846eea8c5..15fa320713cadd1b0625dc95b67a6dc05a79f986 100644
--- a/man/man1/git-drover.1
+++ b/man/man1/git-drover.1
@@ -2,12 +2,12 @@
.\" Title: git-drover
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 10/20/2015
+.\" Date: 07/21/2016
.\" Manual: Chromium depot_tools Manual
-.\" Source: depot_tools 704d890
+.\" Source: depot_tools bf2a341
.\" Language: English
.\"
-.TH "GIT\-DROVER" "1" "10/20/2015" "depot_tools 704d890" "Chromium depot_tools Manual"
+.TH "GIT\-DROVER" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -101,7 +101,7 @@ Before working with branches, you must \fIgclient sync \-\-with_branch_heads\fR
.nf
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
-commit 9b111fcda69cb6bf8a38d1e77867c298d80ca9d1
+commit 26e52487417bedec18e38b4937c721769275ac89
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some\&.committer <some\&.committer@chromium\&.org>
@@ -110,10 +110,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the \*(Aqdrover\*(Aq\&.
-\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 9b111fcda69cb6bf8a38d1e77867c298d80ca9d1\fR
+\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 26e52487417bedec18e38b4937c721769275ac89\fR
Going to cherry\-pick
"""
-commit 9b111fcda69cb6bf8a38d1e77867c298d80ca9d1
+commit 26e52487417bedec18e38b4937c721769275ac89
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
@@ -148,7 +148,7 @@ About to land on 9999\&. Continue (y/n)? y
.nf
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
-commit 89ce5bb7bdf7149754b94e4d9fc5413435e6680d
+commit 0a1d0509ed8d7c486107d7288287b3c05b97a916
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some\&.committer <some\&.committer@chromium\&.org>
@@ -157,10 +157,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the \*(Aqdrover\*(Aq\&.
-\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 89ce5bb7bdf7149754b94e4d9fc5413435e6680d\fR
+\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 0a1d0509ed8d7c486107d7288287b3c05b97a916\fR
Going to cherry\-pick
"""
-commit 89ce5bb7bdf7149754b94e4d9fc5413435e6680d
+commit 0a1d0509ed8d7c486107d7288287b3c05b97a916
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
@@ -219,28 +219,29 @@ Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
# Here\*(Aqs the commit we want to revert\&.
\fB$ git log \-n 1\fR
-commit d5efb50dcc76ea29ad30d1015fb291a9ba5fc0db
+commit 0a9dc1b7ec5b1fe48217c5b88a55f4110bc3f4f0
Author: some\&.committer <some\&.committer@chromium\&.org>
Date: Thu Apr 10 08:54:46 2014 +0000
This change is horribly broken\&.
# Now do the revert\&.
-\fB$ git revert d5efb50dcc76ea29ad30d1015fb291a9ba5fc0db\fR
+\fB$ git revert 0a9dc1b7ec5b1fe48217c5b88a55f4110bc3f4f0\fR
# That reverted the change and committed the revert\&.
\fB$ git log \-n 1\fR
-commit 1b6ccf84e2c13c6f6a2b69b29626aed8fa0ae24d
+commit 84f214d895434bee2ab9aa08562f71a25891a31d
Author: you <you@chromium\&.org>
Date: Thu Apr 10 09:11:36 2014 +0000
Revert "This change is horribly broken\&."
- This reverts commit d5efb50dcc76ea29ad30d1015fb291a9ba5fc0db\&.
+ This reverts commit 0a9dc1b7ec5b1fe48217c5b88a55f4110bc3f4f0\&.
# As with old drover, reverts are generally OK to commit without LGTM\&.
\fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR
\fB$ git cl land \-\-bypass\-hooks\fR
+Using 50% similarity for rename/copy detection\&. Override with \-\-similarity\&.
.fi
.if n \{\
.RE
@@ -267,7 +268,7 @@ Date: Thu Apr 10 09:11:36 2014 +0000
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
-commit 2655f8d9d48f18dbfed237c67b8c65134050b2e3
+commit aecb0b589f95d2efd6a32294cc6e6afb085f6b87
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some\&.committer <some\&.committer@chromium\&.org>
@@ -281,8 +282,8 @@ Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
# Now do the \*(Aqdrover\*(Aq\&.
# IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag
-\fB$ git cherry\-pick \-x 2655f8d9d48f18dbfed237c67b8c65134050b2e3\fR
-[drover_9999 589e8ad] This change needs to go to branch 9999
+\fB$ git cherry\-pick \-x aecb0b589f95d2efd6a32294cc6e6afb085f6b87\fR
+[drover_9999 3f113b7] 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(+)
@@ -291,7 +292,7 @@ Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
# That took the code authored by some\&.committer and committed it to
# the branch by the person who drovered it (i\&.e\&. you)\&.
\fB$ git log \-n 1 \-\-pretty=fuller\fR
-commit 589e8adbb095944100d029724b4038094120f23b
+commit 3f113b79d87aadfbbc6d4ff8de038c69c94dc9b2
Author: some\&.committer <some\&.committer@chromium\&.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: you <you@chromium\&.org>
@@ -299,12 +300,13 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
This change needs to go to branch 9999
- (cherry picked from commit 2655f8d9d48f18dbfed237c67b8c65134050b2e3)
+ (cherry picked from commit aecb0b589f95d2efd6a32294cc6e6afb085f6b87)
# Looks good\&. Ship it!
\fB$ git cl upload\fR
# Wait for LGTM or TBR it\&.
\fB$ git cl land\fR
+Using 50% similarity for rename/copy detection\&. Override with \-\-similarity\&.
# Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq
.fi
.if n \{\
@@ -322,5 +324,5 @@ Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
.IP " 1." 4
here
.RS 4
-\%https://chromium.googlesource.com/chromium/tools/depot_tools.git
+\%https://chromium.googlesource.com/chromium/tools/depot_tools
.RE
« no previous file with comments | « man/man1/git-cherry-pick-upload.1 ('k') | man/man1/git-footers.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698