diff --git a/man/html/depot_tools.html b/man/html/depot_tools.html index 8676c0c3d4..ab1feece89 100644 --- a/man/html/depot_tools.html +++ b/man/html/depot_tools.html @@ -756,7 +756,7 @@ depot_tools(7) Manual Page

The Chromium depot_tools suite contains many tools to assist/augment the Chromium development environment. The tools may be downloaded from -here.

+here.

There are two primary categories of tools. Some of these tools are essential to the development flow, in the sense that you cannot successfully develop Chromium without them.

@@ -771,6 +771,14 @@ ease the develpment workflow.

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

+git-auto-svn(1) +
+
+

+Automatically set up git-svn metadata for a repo mirrored from SVN. +

+
+
git-cherry-pick-upload(1)
@@ -927,7 +935,7 @@ Print a diff of the current branch, compared to its upstream.
diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html index 8df073172c..d55999b03d 100644 --- a/man/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -1573,14 +1573,14 @@ LKGR

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.

+from here.

diff --git a/man/html/git-auto-svn.html b/man/html/git-auto-svn.html index 24445d0330..ea13fef079 100644 --- a/man/html/git-auto-svn.html +++ b/man/html/git-auto-svn.html @@ -823,14 +823,14 @@ git auto-svn

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.

+from here.

diff --git a/man/html/git-cherry-pick-upload.html b/man/html/git-cherry-pick-upload.html index 58b42e8f19..2ac9e8a940 100644 --- a/man/html/git-cherry-pick-upload.html +++ b/man/html/git-cherry-pick-upload.html @@ -774,15 +774,6 @@ as if it were generated by git cherry-pick -x.

EXAMPLE

$ git cherry-pick-upload -h
-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.
 
 $ git cherry-pick-upload -b my_branch c02b7d24a066adb747fdeb12deb21bfa
 Found parent revision: b96d69fda53845a205151613a9c4cc93
@@ -810,14 +801,14 @@ Finalizing upload: OK
 

 
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.

+from here.
diff --git a/man/html/git-drover.html b/man/html/git-drover.html index ebe03457fa..1827fe224e 100644 --- a/man/html/git-drover.html +++ b/man/html/git-drover.html @@ -858,7 +858,7 @@ at least once to fetch the branches.

Merge Example

# Here's a commit (from some.committer) that we want to 'drover'.
 $ git log -n 1 --pretty=fuller
-commit f7448045de01b54914db8b902ca77fbbf42b3146
+commit f1b2947cd99ad36614e71a51a925a6dae060fecd
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer <some.committer@chromium.org>
@@ -867,10 +867,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
     This change needs to go to branch 9999
 
 # Now do the 'drover'.
-$ git drover --branch 9999 --cherry-pick f7448045de01b54914db8b902ca77fbbf42b3146
+$ git drover --branch 9999 --cherry-pick f1b2947cd99ad36614e71a51a925a6dae060fecd
 Going to cherry-pick
 """
-commit f7448045de01b54914db8b902ca77fbbf42b3146
+commit f1b2947cd99ad36614e71a51a925a6dae060fecd
 Author: some.committer <some.committer@chromium.org>
 Date:   Thu Apr 10 08:54:46 2014 +0000
 
@@ -888,7 +888,7 @@ About to land on 9999. Continue (y/n)? y
 
Merge with Conflicts Example

 
# Here's a commit (from some.committer) that we want to 'drover'.
 $ git log -n 1 --pretty=fuller
-commit ca8e437616d853cb10008a252b54cfed928f157c
+commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77
 Author:     some.committer <some.committer@chromium.org>
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer <some.committer@chromium.org>
@@ -897,10 +897,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
     This change needs to go to branch 9999
 
 # Now do the 'drover'.
-$ git drover --branch 9999 --cherry-pick ca8e437616d853cb10008a252b54cfed928f157c
+$ git drover --branch 9999 --cherry-pick 78d5e1beb49c2bfa0369a2712dd1b4a502805a77
 Going to cherry-pick
 """
-commit ca8e437616d853cb10008a252b54cfed928f157c
+commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77
 Author: some.committer <some.committer@chromium.org>
 Date:   Thu Apr 10 08:54:46 2014 +0000
 
@@ -942,28 +942,29 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
 
 # Here's the commit we want to revert.
 $ git log -n 1
-commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b
+commit d281ba6029d6bff1368a5885be8e2c638e1bfe73
 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.
-$ git revert 98d544a18e19bb80be9d4a8094efda8ab1d2534b
+$ git revert d281ba6029d6bff1368a5885be8e2c638e1bfe73
 
 # That reverted the change and committed the revert.
 $ git log -n 1
-commit 0fc5e9101886dcb1aebbb9434d0df9341f0dedfe
+commit 7eb05d0f8e79ef563684500dc38d0dee069f7dc6
 Author: you <you@chromium.org>
 Date:   Thu Apr 10 09:11:36 2014 +0000
 
     Revert "This change is horribly broken."
 
-    This reverts commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b.
+    This reverts commit d281ba6029d6bff1368a5885be8e2c638e1bfe73.
 
 # As with old drover, reverts are generally OK to commit without LGTM.
 $ git cl upload -r some.committer@chromium.org --send-mail
 $ git cl land --bypass-hooks
+Using 50% similarity for rename/copy detection. Override with --similarity.
@@ -973,7 +974,7 @@ Date: Thu Apr 10 09:11:36 2014 +0000 # Here's a commit (from some.committer) that we want to 'drover'. $ git log -n 1 --pretty=fuller -commit b27fff7b167964750303f60222e79f3932f438e0 +commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422 Author: some.committer <some.committer@chromium.org> AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some.committer <some.committer@chromium.org> @@ -987,8 +988,8 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999. # Now do the 'drover'. # IMPORTANT!!! Do Not leave off the '-x' flag -$ git cherry-pick -x b27fff7b167964750303f60222e79f3932f438e0 -[drover_9999 bd8dc1c] This change needs to go to branch 9999 +$ git cherry-pick -x b9199aa1ab7d60a1e127de8c46c0983d13f2c422 +[drover_9999 729161e] 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(+) @@ -997,7 +998,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). $ git log -n 1 --pretty=fuller -commit bd8dc1c0678913e36b2b06855810803a2e0ab906 +commit 729161e36af15142cdf591021de71e70e0db1ea2 Author: some.committer <some.committer@chromium.org> AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: you <you@chromium.org> @@ -1005,12 +1006,13 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000 This change needs to go to branch 9999 - (cherry picked from commit b27fff7b167964750303f60222e79f3932f438e0) + (cherry picked from commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422) # Looks good. Ship it! $ git cl upload # Wait for LGTM or TBR it. $ git cl land +Using 50% similarity for rename/copy detection. Override with --similarity. # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'

@@ -1028,14 +1030,14 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000

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.

+from here.

diff --git a/man/html/git-footers.html b/man/html/git-footers.html index 0315f4a938..76e6020e1f 100644 --- a/man/html/git-footers.html +++ b/man/html/git-footers.html @@ -864,14 +864,14 @@ refs/heads/master

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.

+from here.

diff --git a/man/html/git-freeze.html b/man/html/git-freeze.html index c29b3ab923..1fe6078775 100644 --- a/man/html/git-freeze.html +++ b/man/html/git-freeze.html @@ -790,7 +790,7 @@ time you ran git freeze (freshly modified files, new files, etc.).

$ git freeze $ git status --short $ git log -n 2 --stat -commit 07f208f5916bd8ee3affbf8d182c918a8dc1a699 +commit 42c38320f46c6bc9a8aba7f15b41971e5f1db75b Author: local <local@chromium.org> Date: Thu Apr 10 08:54:56 2014 +0000 @@ -802,7 +802,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000 unstaged_deleted_file | 1 - 4 files changed, 2 insertions(+), 1 deletion(-) -commit 9f803ff1f05dd0c77d31b8958992520e37ed6278 +commit 5e0079a0fd55960682c389e71e0283594a80c02b Author: local <local@chromium.org> Date: Thu Apr 10 08:54:56 2014 +0000 @@ -845,14 +845,14 @@ limit disables the size-limit check entirely. 100 by default.

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.

+from here.

diff --git a/man/html/git-hyper-blame.html b/man/html/git-hyper-blame.html index c123d81b06..2daa63e936 100644 --- a/man/html/git-hyper-blame.html +++ b/man/html/git-hyper-blame.html @@ -864,14 +864,14 @@ other more invasive changes.

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.

+from here.

diff --git a/man/html/git-map-branches.html b/man/html/git-map-branches.html index 5ac03db112..c208d32322 100644 --- a/man/html/git-map-branches.html +++ b/man/html/git-map-branches.html @@ -858,14 +858,14 @@ file.

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.

+from here.

diff --git a/man/html/git-map.html b/man/html/git-map.html index 71cfda9860..91e24bb539 100644 --- a/man/html/git-map.html +++ b/man/html/git-map.html @@ -835,7 +835,7 @@ configure this, use git config --add depot-tools.map-extra <value>

Running git map would result in an output something like: 

$ git map
-* d0fb9c7	 (frozen_branch) 2014-04-10 ~ FREEZE.unindexed
+* d0fb9c7	 (HEAD -> frozen_branch) 2014-04-10 ~ FREEZE.unindexed
 * f48f415	 2014-04-10 ~ modfile
 * 4c5b9c0	 2014-04-10 ~ a deleted file
 * f7ce1e4	 (fixit) 2014-04-10 ~ Add neat feature    <(frozen_branch)
@@ -873,14 +873,14 @@ branch), use the git-map-branches(1) command
 

 
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.

+from here.
diff --git a/man/html/git-mark-merge-base.html b/man/html/git-mark-merge-base.html index 9e6f4e0c57..47e74283bf 100644 --- a/man/html/git-mark-merge-base.html +++ b/man/html/git-mark-merge-base.html @@ -812,14 +812,14 @@ configuration variable for more info on what the merge base markers are for.

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.

+from here.

diff --git a/man/html/git-nav-downstream.html b/man/html/git-nav-downstream.html index fcb4a5ec1f..27ca30b5bf 100644 --- a/man/html/git-nav-downstream.html +++ b/man/html/git-nav-downstream.html @@ -773,20 +773,20 @@ command will prompt you with a selection of the branches.

EXAMPLE

$ git map-branches
-origin/master *
+origin/master
   cool_feature
     subfeature
   fixit
     frozen_branch
 $ git nav-downstream
-Please select a downstream branch
-  0. cool_feature
-  1. fixit
-Selection (0-1)[0]: 0
 Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes
 Switched to branch 'cool_feature'
 Your branch is ahead of 'origin/master' by 4 commits.
   (use "git push" to publish your local commits)
+Please select a downstream branch
+  0. cool_feature
+  1. fixit
+Selection (0-1)[0]: 0
 $ git map-branches
 origin/master
   cool_feature *
@@ -830,14 +830,14 @@ file.

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.

+from here.

diff --git a/man/html/git-nav-upstream.html b/man/html/git-nav-upstream.html index ca0576627f..ebc84dd515 100644 --- a/man/html/git-nav-upstream.html +++ b/man/html/git-nav-upstream.html @@ -796,11 +796,11 @@ state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: - git checkout -b new_branch_name + git checkout -b <new-branch-name> HEAD is now at beec6f4... Make ReflectorImpl use mailboxes $ git map-branches -origin/master * +origin/master cool_feature subfeature fixit @@ -833,14 +833,14 @@ file.

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.

+from here.

diff --git a/man/html/git-new-branch.html b/man/html/git-new-branch.html index 283d40c1f8..965e9c824b 100644 --- a/man/html/git-new-branch.html +++ b/man/html/git-new-branch.html @@ -910,14 +910,14 @@ mnemonic: tb → "track branch"

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.

+from here.

diff --git a/man/html/git-rebase-update.html b/man/html/git-rebase-update.html index 9bf33e8cd6..0d857ac616 100644 --- a/man/html/git-rebase-update.html +++ b/man/html/git-rebase-update.html @@ -928,14 +928,14 @@ file.

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.

+from here.

diff --git a/man/html/git-rename-branch.html b/man/html/git-rename-branch.html index 6977494a18..0d1b0e422d 100644 --- a/man/html/git-rename-branch.html +++ b/man/html/git-rename-branch.html @@ -780,14 +780,14 @@ tracking information to preserve inter-branch dependencies.

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.

+from here.

diff --git a/man/html/git-reparent-branch.html b/man/html/git-reparent-branch.html index ba8a0fc78b..e9482c956b 100644 --- a/man/html/git-reparent-branch.html +++ b/man/html/git-reparent-branch.html @@ -833,14 +833,14 @@ file.

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.

+from here.

diff --git a/man/html/git-retry.html b/man/html/git-retry.html index 1feaaae2ed..f6c7ea889c 100644 --- a/man/html/git-retry.html +++ b/man/html/git-retry.html @@ -844,14 +844,14 @@ failure, it will exit with the exit code of the last failed attempt.

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.

+from here.

diff --git a/man/html/git-squash-branch.html b/man/html/git-squash-branch.html index ab3a09f861..fa341577c1 100644 --- a/man/html/git-squash-branch.html +++ b/man/html/git-squash-branch.html @@ -801,7 +801,7 @@ verify that the conflict diff is what you expected (and then skip it with

EXAMPLE

$ git map
-* d0fb9c7	 (frozen_branch) 2014-04-10 ~ FREEZE.unindexed
+* d0fb9c7	 (HEAD -> frozen_branch) 2014-04-10 ~ FREEZE.unindexed
 * f48f415	 2014-04-10 ~ modfile
 * 4c5b9c0	 2014-04-10 ~ a deleted file
 * f7ce1e4	 (fixit) 2014-04-10 ~ Add neat feature    <(frozen_branch)
@@ -823,7 +823,7 @@ verify that the conflict diff is what you expected (and then skip it with
 * 33a7a74	 2014-04-10 ~ Always output seccomp error messages to stderr
 $ git squash-branch -m 'cool squash demo'
 $ git map
-* 98e69e8	 (frozen_branch) 2014-04-10 ~ cool squash demo
+* 98e69e8	 (HEAD -> frozen_branch) 2014-04-10 ~ cool squash demo
 * f7ce1e4	 (fixit) 2014-04-10 ~ Add neat feature    <(frozen_branch)
 * 3726937	 2014-04-10 ~ Epic README update
 | * 14db2e5	 (cool_feature) 2014-04-10 ~ Respond to CL comments
@@ -867,14 +867,14 @@ file.

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.

+from here.

diff --git a/man/html/git-thaw.html b/man/html/git-thaw.html index 589d4f0eeb..1cfe42454e 100644 --- a/man/html/git-thaw.html +++ b/man/html/git-thaw.html @@ -780,14 +780,14 @@ freeze), git thaw will thaw all of the freezes.

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.

+from here.

diff --git a/man/html/git-upstream-diff.html b/man/html/git-upstream-diff.html index 220f601b22..4621e86320 100644 --- a/man/html/git-upstream-diff.html +++ b/man/html/git-upstream-diff.html @@ -884,14 +884,14 @@ file.

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.

+from here.

diff --git a/man/man1/git-auto-svn.1 b/man/man1/git-auto-svn.1 index 84e238bb45..8cf092cb82 100644 --- a/man/man1/git-auto-svn.1 +++ b/man/man1/git-auto-svn.1 @@ -2,12 +2,12 @@ .\" Title: git-auto-svn .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 09/30/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 2bbacdc +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-AUTO\-SVN" "1" "09/30/2014" "depot_tools 2bbacdc" "Chromium depot_tools Manual" +.TH "GIT\-AUTO\-SVN" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -109,5 +109,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 diff --git a/man/man1/git-cherry-pick-upload.1 b/man/man1/git-cherry-pick-upload.1 index 6c327a9e13..984b923fd3 100644 --- a/man/man1/git-cherry-pick-upload.1 +++ b/man/man1/git-cherry-pick-upload.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-cherry-pick-upload .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 08/20/2014 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 8d3348f +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK\-U" "1" "08/20/2014" "depot_tools 8d3348f" "Chromium depot_tools Manual" +.TH "GIT\-CHERRY\-PICK\-U" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -49,15 +49,6 @@ The commit message is annotated with "(cherry picked from commit [parent sha1])" .\} .nf \fB$ git cherry\-pick\-upload \-h\fR -usage: git_cherry_pick_upload\&.py [\-h] \-\-branch - -positional arguments: - SHA to cherry pick\&. - -optional arguments: - \-h, \-\-help show this help message and exit - \-\-branch , \-b - The upstream branch to cherry pick to\&. \fB$ git cherry\-pick\-upload \-b my_branch c02b7d24a066adb747fdeb12deb21bfa\fR Found parent revision: b96d69fda53845a205151613a9c4cc93 @@ -85,5 +76,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 diff --git a/man/man1/git-drover.1 b/man/man1/git-drover.1 index 82744a2dd1..15fa320713 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 -.\" 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 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some\&.committer @@ -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 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 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some\&.committer @@ -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 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 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 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 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: some\&.committer @@ -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 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 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 Commit: you @@ -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 diff --git a/man/man1/git-footers.1 b/man/man1/git-footers.1 index 84f521dc25..b708ea504f 100644 --- a/man/man1/git-footers.1 +++ b/man/man1/git-footers.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-footers .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 09/09/2014 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 27c5488 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-FOOTERS" "1" "09/09/2014" "depot_tools 27c5488" "Chromium depot_tools Manual" +.TH "GIT\-FOOTERS" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -140,5 +140,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 diff --git a/man/man1/git-freeze.1 b/man/man1/git-freeze.1 index 787d2e53dd..809df1b88f 100644 --- a/man/man1/git-freeze.1 +++ b/man/man1/git-freeze.1 @@ -2,12 +2,12 @@ .\" Title: git-freeze .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 06/04/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools d39bbb5 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-FREEZE" "1" "06/04/2014" "depot_tools d39bbb5" "Chromium depot_tools Manual" +.TH "GIT\-FREEZE" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -60,7 +60,7 @@ D deleted_file \fB$ git freeze\fR \fB$ git status \-\-short\fR \fB$ git log \-n 2 \-\-stat\fR -commit 13e157e1f666206fca297c48bec82f3f16ae3c2f +commit fd6fc0bda72f3f60055d8d5f7953862a9566794b Author: local Date: Thu Apr 10 08:54:56 2014 +0000 @@ -72,7 +72,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000 unstaged_deleted_file | 1 \- 4 files changed, 2 insertions(+), 1 deletion(\-) -commit 30791edff23b9a8fecc5f863da134e820a4c9f1a +commit 092c50e807dbdadd0979a43e7ccc50cbfd6b4c98 Author: local Date: Thu Apr 10 08:54:56 2014 +0000 @@ -109,5 +109,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 diff --git a/man/man1/git-hyper-blame.1 b/man/man1/git-hyper-blame.1 index ef7d80a6b6..169eeda676 100644 --- a/man/man1/git-hyper-blame.1 +++ b/man/man1/git-hyper-blame.1 @@ -2,12 +2,12 @@ .\" Title: git-hyper-blame .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 02/19/2016 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools ba74a75 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-HYPER\-BLAME" "1" "02/19/2016" "depot_tools ba74a75" "Chromium depot_tools Manual" +.TH "GIT\-HYPER\-BLAME" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -124,5 +124,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 diff --git a/man/man1/git-map-branches.1 b/man/man1/git-map-branches.1 index 552a495ed1..246f4869b9 100644 --- a/man/man1/git-map-branches.1 +++ b/man/man1/git-map-branches.1 @@ -1,13 +1,13 @@ '\" t .\" Title: git-map-branches .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 09/23/2014 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 28bf2be +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-MAP\-BRANCHES" "1" "09/23/2014" "depot_tools 28bf2be" "Chromium depot_tools Manual" +.TH "GIT\-MAP\-BRANCHES" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -95,7 +95,6 @@ red .sp -1 .IP \(bu 2.3 .\} - \fIbranch\-heads\fR branches are blue\&. @@ -109,7 +108,6 @@ blue\&. .sp -1 .IP \(bu 2.3 .\} - {NO UPSTREAM} is a special placeholder in magenta\&. @@ -189,5 +187,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 diff --git a/man/man1/git-map.1 b/man/man1/git-map.1 index c3fdb11012..bab0f29560 100644 --- a/man/man1/git-map.1 +++ b/man/man1/git-map.1 @@ -2,12 +2,12 @@ .\" Title: git-map .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/10/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 68b1017 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-MAP" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual" +.TH "GIT\-MAP" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -138,7 +138,7 @@ Running \fIgit map\fR would result in an output something like: .\} .nf \fB$ git map\fR -\fB* d0fb9c7 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed +* \fBd0fb9c7 \fR (HEAD \-> frozen_branch) 2014\-04\-10 ~ FREEZE\&.unindexed * \fBf48f415 \fR 2014\-04\-10 ~ modfile * \fB4c5b9c0 \fR 2014\-04\-10 ~ a deleted file * \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR @@ -175,5 +175,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 diff --git a/man/man1/git-mark-merge-base.1 b/man/man1/git-mark-merge-base.1 index c7edd09481..f80ec208e9 100644 --- a/man/man1/git-mark-merge-base.1 +++ b/man/man1/git-mark-merge-base.1 @@ -2,12 +2,12 @@ .\" Title: git-mark-merge-base .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/10/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 68b1017 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-MARK\-MERGE\-BA" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual" +.TH "GIT\-MARK\-MERGE\-BA" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -65,5 +65,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 diff --git a/man/man1/git-nav-downstream.1 b/man/man1/git-nav-downstream.1 index a7219522ee..c81c86a41f 100644 --- a/man/man1/git-nav-downstream.1 +++ b/man/man1/git-nav-downstream.1 @@ -2,12 +2,12 @@ .\" Title: git-nav-downstream .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/10/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 1ce0237 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-NAV\-DOWNSTREAM" "1" "04/10/2014" "depot_tools 1ce0237" "Chromium depot_tools Manual" +.TH "GIT\-NAV\-DOWNSTREAM" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -47,20 +47,20 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out .\} .nf \fB$ git map\-branches\fR -\fBorigin/master * +\fBorigin/master \fR cool_feature subfeature fixit frozen_branch \fB$ git nav\-downstream\fR -Please select a downstream branch - 0\&. cool_feature - 1\&. fixit -Selection (0\-1)[0]: 0 Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes Switched to branch \*(Aqcool_feature\*(Aq Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&. (use "git push" to publish your local commits) +Please select a downstream branch + 0\&. cool_feature + 1\&. fixit +Selection (0\-1)[0]: 0 \fB$ git map\-branches\fR origin/master \fB cool_feature * @@ -108,5 +108,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 diff --git a/man/man1/git-nav-upstream.1 b/man/man1/git-nav-upstream.1 index 58b602a2e3..989bd3af2f 100644 --- a/man/man1/git-nav-upstream.1 +++ b/man/man1/git-nav-upstream.1 @@ -2,12 +2,12 @@ .\" Title: git-nav-upstream .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/10/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 1ce0237 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-NAV\-UPSTREAM" "1" "04/10/2014" "depot_tools 1ce0237" "Chromium depot_tools Manual" +.TH "GIT\-NAV\-UPSTREAM" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -72,11 +72,11 @@ state without impacting any branches by performing another checkout\&. If you want to create a new branch to retain commits you create, you may do so (now or later) by using \-b with the checkout command again\&. Example: - git checkout \-b new_branch_name + git checkout \-b HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes \fB$ git map\-branches\fR -\fBorigin/master * +\fBorigin/master \fR cool_feature subfeature fixit @@ -112,5 +112,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 diff --git a/man/man1/git-new-branch.1 b/man/man1/git-new-branch.1 index 2d85285665..a0e8401cfa 100644 --- a/man/man1/git-new-branch.1 +++ b/man/man1/git-new-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-new-branch .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/10/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 68b1017 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-NEW\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual" +.TH "GIT\-NEW\-BRANCH" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -164,5 +164,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 diff --git a/man/man1/git-rebase-update.1 b/man/man1/git-rebase-update.1 index c53a9adcf9..0223270288 100644 --- a/man/man1/git-rebase-update.1 +++ b/man/man1/git-rebase-update.1 @@ -2,12 +2,12 @@ .\" Title: git-rebase-update .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 09/10/2015 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 805792e +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-REBASE\-UPDATE" "1" "09/10/2015" "depot_tools 805792e" "Chromium depot_tools Manual" +.TH "GIT\-REBASE\-UPDATE" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -163,5 +163,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 diff --git a/man/man1/git-rename-branch.1 b/man/man1/git-rename-branch.1 index 3f3fba6124..f7efa3a3a9 100644 --- a/man/man1/git-rename-branch.1 +++ b/man/man1/git-rename-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-rename-branch .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/10/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 68b1017 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-RENAME\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual" +.TH "GIT\-RENAME\-BRANCH" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -49,5 +49,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 diff --git a/man/man1/git-reparent-branch.1 b/man/man1/git-reparent-branch.1 index 392013e37a..44ef895fce 100644 --- a/man/man1/git-reparent-branch.1 +++ b/man/man1/git-reparent-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-reparent-branch .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/10/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 68b1017 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-REPARENT\-BRANC" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual" +.TH "GIT\-REPARENT\-BRANC" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -89,5 +89,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 diff --git a/man/man1/git-retry.1 b/man/man1/git-retry.1 index 18538b1d6b..19d84924f1 100644 --- a/man/man1/git-retry.1 +++ b/man/man1/git-retry.1 @@ -2,12 +2,12 @@ .\" Title: git-retry .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/22/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 7242c60 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-RETRY" "1" "07/22/2014" "depot_tools 7242c60" "Chromium depot_tools Manual" +.TH "GIT\-RETRY" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -104,5 +104,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 diff --git a/man/man1/git-squash-branch.1 b/man/man1/git-squash-branch.1 index 2d027a5567..e6b55f0c8e 100644 --- a/man/man1/git-squash-branch.1 +++ b/man/man1/git-squash-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-squash-branch .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/10/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 68b1017 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-SQUASH\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual" +.TH "GIT\-SQUASH\-BRANCH" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -55,7 +55,7 @@ Optional message to use for the first line of the squashed commit\&. If omitted, .\} .nf \fB$ git map\fR -\fB* d0fb9c7 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed +* \fBd0fb9c7 \fR (HEAD \-> frozen_branch) 2014\-04\-10 ~ FREEZE\&.unindexed * \fBf48f415 \fR 2014\-04\-10 ~ modfile * \fB4c5b9c0 \fR 2014\-04\-10 ~ a deleted file * \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR @@ -77,7 +77,7 @@ Optional message to use for the first line of the squashed commit\&. If omitted, * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stderr \fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR \fB$ git map\fR -\fB* 98e69e8 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo +* \fB98e69e8 \fR (HEAD \-> frozen_branch) 2014\-04\-10 ~ cool squash demo * \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen_branch)\fR * \fB3726937 \fR 2014\-04\-10 ~ Epic README update | * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments @@ -125,5 +125,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 diff --git a/man/man1/git-thaw.1 b/man/man1/git-thaw.1 index daadf1b929..9a6d53bf45 100644 --- a/man/man1/git-thaw.1 +++ b/man/man1/git-thaw.1 @@ -2,12 +2,12 @@ .\" Title: git-thaw .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/10/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 68b1017 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-THAW" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot_tools Manual" +.TH "GIT\-THAW" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -50,5 +50,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 diff --git a/man/man1/git-upstream-diff.1 b/man/man1/git-upstream-diff.1 index f25800ff00..5bb99f6d7c 100644 --- a/man/man1/git-upstream-diff.1 +++ b/man/man1/git-upstream-diff.1 @@ -2,12 +2,12 @@ .\" Title: git-upstream-diff .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 05/07/2014 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools cab11c5 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "GIT\-UPSTREAM\-DIFF" "1" "05/07/2014" "depot_tools cab11c5" "Chromium depot_tools Manual" +.TH "GIT\-UPSTREAM\-DIFF" "1" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -123,5 +123,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 diff --git a/man/man7/depot_tools.7 b/man/man7/depot_tools.7 index 36d706a206..8bf199b5eb 100644 --- a/man/man7/depot_tools.7 +++ b/man/man7/depot_tools.7 @@ -2,12 +2,12 @@ .\" Title: depot_tools .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 01/28/2016 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 7143379 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "DEPOT_TOOLS" "7" "01/28/2016" "depot_tools 7143379" "Chromium depot_tools Manual" +.TH "DEPOT_TOOLS" "7" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,6 +42,11 @@ 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-auto-svn\fR(1) +.RS 4 +Automatically set up git\-svn metadata for a repo mirrored from SVN\&. +.RE +.PP \fBgit-cherry-pick-upload\fR(1) .RS 4 Upload the diff between a revision and its parent to rietveld\&. @@ -135,5 +140,5 @@ Print a diff of the current branch, compared to its upstream\&. .IP " 1." 4 here .RS 4 -\%https://chromium.googlesource.com/chromium/tools/depot_tools.git +\%https://chromium.googlesource.com/chromium/tools/depot_tools .RE diff --git a/man/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7 index 0c5761ae85..4975065dbc 100644 --- a/man/man7/depot_tools_tutorial.7 +++ b/man/man7/depot_tools_tutorial.7 @@ -2,12 +2,12 @@ .\" Title: depot_tools_tutorial .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 07/20/2016 +.\" Date: 07/21/2016 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools 5ef2ca1 +.\" Source: depot_tools bf2a341 .\" Language: English .\" -.TH "DEPOT_TOOLS_TUTORIAL" "7" "07/20/2016" "depot_tools 5ef2ca1" "Chromium depot_tools Manual" +.TH "DEPOT_TOOLS_TUTORIAL" "7" "07/21/2016" "depot_tools bf2a341" "Chromium depot_tools Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1051,5 +1051,5 @@ main Chromium waterfall .IP " 7." 4 here .RS 4 -\%https://chromium.googlesource.com/chromium/tools/depot_tools.git +\%https://chromium.googlesource.com/chromium/tools/depot_tools .RE