libv8 7.4.288.28.0beta1 → 7.8.279.23.0beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +0 -1
- data/lib/libv8/version.rb +1 -1
- data/vendor/depot_tools/annotated_gclient.py +2 -4
- data/vendor/depot_tools/auth.py +0 -2
- data/vendor/depot_tools/autoninja +1 -3
- data/vendor/depot_tools/autoninja.bat +1 -1
- data/vendor/depot_tools/autoninja.py +1 -3
- data/vendor/depot_tools/bb +1 -1
- data/vendor/depot_tools/bootstrap/win/manifest.txt +1 -1
- data/vendor/depot_tools/buildbucket.py +6 -8
- data/vendor/depot_tools/checkout.py +5 -7
- data/vendor/depot_tools/cipd +1 -1
- data/vendor/depot_tools/cipd_manifest.txt +4 -4
- data/vendor/depot_tools/cipd_manifest.versions +80 -80
- data/vendor/depot_tools/cit.py +7 -9
- data/vendor/depot_tools/clang_format.py +1 -4
- data/vendor/depot_tools/clang_format_merge_driver.py +7 -9
- data/vendor/depot_tools/compile_single_file.py +1 -3
- data/vendor/depot_tools/dart_format.py +2 -4
- data/vendor/depot_tools/depot-tools-auth.py +8 -10
- data/vendor/depot_tools/fix_encoding.py +2 -5
- data/vendor/depot_tools/gclient-new-workdir.py +0 -2
- data/vendor/depot_tools/gclient.py +9 -8
- data/vendor/depot_tools/gclient_scm.py +28 -54
- data/vendor/depot_tools/gclient_utils.py +4 -14
- data/vendor/depot_tools/gerrit_util.py +6 -8
- data/vendor/depot_tools/git_cache.py +37 -53
- data/vendor/depot_tools/git_cl.py +42 -115
- data/vendor/depot_tools/git_drover.py +1 -3
- data/vendor/depot_tools/git_find_releases.py +6 -8
- data/vendor/depot_tools/git_footers.py +5 -7
- data/vendor/depot_tools/git_freezer.py +1 -3
- data/vendor/depot_tools/git_map_branches.py +5 -7
- data/vendor/depot_tools/git_mark_merge_base.py +6 -8
- data/vendor/depot_tools/git_nav_downstream.py +5 -7
- data/vendor/depot_tools/git_number.py +1 -3
- data/vendor/depot_tools/git_rebase_update.py +43 -38
- data/vendor/depot_tools/git_reparent_branch.py +6 -8
- data/vendor/depot_tools/git_upstream_diff.py +2 -4
- data/vendor/depot_tools/gn.py +4 -6
- data/vendor/depot_tools/infra/config/recipes.cfg +1 -1
- data/vendor/depot_tools/led +1 -1
- data/vendor/depot_tools/luci-auth +1 -1
- data/vendor/depot_tools/lucicfg +1 -1
- data/vendor/depot_tools/mac_toolchain +1 -1
- data/vendor/depot_tools/man/html/depot_tools.html +1 -1
- data/vendor/depot_tools/man/html/depot_tools_tutorial.html +22 -28
- data/vendor/depot_tools/man/html/git-cl.html +1 -1
- data/vendor/depot_tools/man/html/git-drover.html +18 -18
- data/vendor/depot_tools/man/html/git-footers.html +1 -1
- data/vendor/depot_tools/man/html/git-freeze.html +3 -3
- data/vendor/depot_tools/man/html/git-hyper-blame.html +1 -1
- data/vendor/depot_tools/man/html/git-map-branches.html +2 -2
- data/vendor/depot_tools/man/html/git-map.html +1 -1
- data/vendor/depot_tools/man/html/git-mark-merge-base.html +1 -1
- data/vendor/depot_tools/man/html/git-nav-downstream.html +3 -3
- data/vendor/depot_tools/man/html/git-nav-upstream.html +6 -12
- data/vendor/depot_tools/man/html/git-new-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-rebase-update.html +1 -20
- data/vendor/depot_tools/man/html/git-rename-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-reparent-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-retry.html +1 -1
- data/vendor/depot_tools/man/html/git-squash-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-thaw.html +1 -1
- data/vendor/depot_tools/man/html/git-upstream-diff.html +6 -10
- data/vendor/depot_tools/man/man1/git-cl.1 +4 -4
- data/vendor/depot_tools/man/man1/git-drover.1 +21 -21
- data/vendor/depot_tools/man/man1/git-footers.1 +4 -4
- data/vendor/depot_tools/man/man1/git-freeze.1 +6 -6
- data/vendor/depot_tools/man/man1/git-hyper-blame.1 +4 -4
- data/vendor/depot_tools/man/man1/git-map-branches.1 +4 -4
- data/vendor/depot_tools/man/man1/git-map.1 +4 -4
- data/vendor/depot_tools/man/man1/git-mark-merge-base.1 +4 -4
- data/vendor/depot_tools/man/man1/git-nav-downstream.1 +6 -6
- data/vendor/depot_tools/man/man1/git-nav-upstream.1 +9 -15
- data/vendor/depot_tools/man/man1/git-new-branch.1 +3 -3
- data/vendor/depot_tools/man/man1/git-rebase-update.1 +4 -14
- data/vendor/depot_tools/man/man1/git-rename-branch.1 +4 -4
- data/vendor/depot_tools/man/man1/git-reparent-branch.1 +4 -4
- data/vendor/depot_tools/man/man1/git-retry.1 +4 -4
- data/vendor/depot_tools/man/man1/git-squash-branch.1 +4 -4
- data/vendor/depot_tools/man/man1/git-thaw.1 +4 -4
- data/vendor/depot_tools/man/man1/git-upstream-diff.1 +13 -7
- data/vendor/depot_tools/man/man7/depot_tools.7 +4 -4
- data/vendor/depot_tools/man/man7/depot_tools_tutorial.7 +27 -33
- data/vendor/depot_tools/man/src/filter_demo_output.py +1 -3
- data/vendor/depot_tools/man/src/git-rebase-update.txt +0 -7
- data/vendor/depot_tools/my_activity.py +11 -13
- data/vendor/depot_tools/my_reviews.py +29 -34
- data/vendor/depot_tools/ninjalog_uploader_wrapper.py +2 -4
- data/vendor/depot_tools/owners_finder.py +1 -3
- data/vendor/depot_tools/patch.py +1 -1
- data/vendor/depot_tools/post_build_ninja_summary.py +15 -17
- data/vendor/depot_tools/presubmit_canned_checks.py +1 -3
- data/vendor/depot_tools/presubmit_support.py +5 -10
- data/vendor/depot_tools/prpc +1 -1
- data/vendor/depot_tools/recipes/README.recipes.md +17 -17
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json +4 -2
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json +5 -0
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json +4 -2
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json +5 -25
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json +5 -23
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json +5 -23
- data/vendor/depot_tools/recipes/recipe_modules/gclient/config.py +6 -0
- data/vendor/depot_tools/recipes/recipe_modules/gclient/examples/full.py +1 -0
- data/vendor/depot_tools/recipes/recipe_modules/gerrit/examples/full.expected/basic.json +5 -1
- data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json +5 -0
- data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/set_failure_hash_with_no_steps.json +3 -1
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch_luci.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch_new.json +6 -4
- data/vendor/depot_tools/rietveld.py +1 -3
- data/vendor/depot_tools/roll_dep.py +0 -2
- data/vendor/depot_tools/roll_dep_svn.py +11 -14
- data/vendor/depot_tools/scm.py +5 -10
- data/vendor/depot_tools/split_cl.py +11 -13
- data/vendor/depot_tools/subprocess2.py +1 -1
- data/vendor/depot_tools/third_party/colorama/LICENSE.txt +1 -0
- data/vendor/depot_tools/third_party/colorama/README.chromium +5 -4
- data/vendor/depot_tools/third_party/colorama/README.txt +304 -0
- data/vendor/depot_tools/third_party/colorama/__init__.py +4 -3
- data/vendor/depot_tools/third_party/colorama/ansi.py +30 -82
- data/vendor/depot_tools/third_party/colorama/ansitowin32.py +37 -105
- data/vendor/depot_tools/third_party/colorama/initialise.py +15 -39
- data/vendor/depot_tools/third_party/colorama/win32.py +28 -46
- data/vendor/depot_tools/third_party/colorama/winterm.py +31 -80
- data/vendor/depot_tools/third_party/upload.py +1 -1
- data/vendor/depot_tools/upload_to_google_storage.py +6 -8
- data/vendor/depot_tools/vpython +1 -1
- data/vendor/depot_tools/watchlists.py +3 -5
- data/vendor/depot_tools/weekly +2 -4
- data/vendor/depot_tools/win_toolchain/get_toolchain_if_necessary.py +36 -38
- data/vendor/depot_tools/win_toolchain/package_from_installed.py +8 -10
- data/vendor/depot_tools/wtf +3 -5
- metadata +3 -3
- data/vendor/depot_tools/third_party/colorama/README.rst +0 -346
@@ -787,7 +787,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
787
787
|
<div id="footnotes"><hr /></div>
|
788
788
|
<div id="footer">
|
789
789
|
<div id="footer-text">
|
790
|
-
Last updated
|
790
|
+
Last updated 2016-12-15 15:36:52 PST
|
791
791
|
</div>
|
792
792
|
</div>
|
793
793
|
</body>
|
@@ -840,7 +840,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
840
840
|
<div id="footnotes"><hr /></div>
|
841
841
|
<div id="footer">
|
842
842
|
<div id="footer-text">
|
843
|
-
Last updated
|
843
|
+
Last updated 2016-12-15 15:36:52 PST
|
844
844
|
</div>
|
845
845
|
</div>
|
846
846
|
</body>
|
@@ -851,7 +851,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
851
851
|
<div id="footnotes"><hr /></div>
|
852
852
|
<div id="footer">
|
853
853
|
<div id="footer-text">
|
854
|
-
Last updated
|
854
|
+
Last updated 2016-12-15 15:36:52 PST
|
855
855
|
</div>
|
856
856
|
</div>
|
857
857
|
</body>
|
@@ -874,7 +874,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
874
874
|
<div id="footnotes"><hr /></div>
|
875
875
|
<div id="footer">
|
876
876
|
<div id="footer-text">
|
877
|
-
Last updated
|
877
|
+
Last updated 2017-02-27 13:47:35 PST
|
878
878
|
</div>
|
879
879
|
</div>
|
880
880
|
</body>
|
@@ -787,7 +787,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
787
787
|
<div id="footnotes"><hr /></div>
|
788
788
|
<div id="footer">
|
789
789
|
<div id="footer-text">
|
790
|
-
Last updated
|
790
|
+
Last updated 2016-12-15 15:36:52 PST
|
791
791
|
</div>
|
792
792
|
</div>
|
793
793
|
</body>
|
@@ -819,15 +819,11 @@ $ # etc.</code></pre>
|
|
819
819
|
<p>
|
820
820
|
Print a colorized word-wise diff instead of a line-wise diff.
|
821
821
|
</p>
|
822
|
-
|
823
|
-
<
|
824
|
-
|
825
|
-
|
826
|
-
|
827
|
-
<p>
|
828
|
-
Show a diff between the specified branch and its upstream, instead of using
|
829
|
-
the current branch.
|
830
|
-
</p>
|
822
|
+
<div class="literalblock">
|
823
|
+
<div class="content">
|
824
|
+
<pre><code>Show a diff between the specified branch and its upstream, instead of using
|
825
|
+
the current branch.</code></pre>
|
826
|
+
</div></div>
|
831
827
|
</dd>
|
832
828
|
<dt class="hdlist1">
|
833
829
|
<extra args for git-diff>
|
@@ -916,7 +912,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
916
912
|
<div id="footnotes"><hr /></div>
|
917
913
|
<div id="footer">
|
918
914
|
<div id="footer-text">
|
919
|
-
Last updated
|
915
|
+
Last updated 2018-06-20 00:12:01 PDT
|
920
916
|
</div>
|
921
917
|
</div>
|
922
918
|
</body>
|
@@ -1,13 +1,13 @@
|
|
1
1
|
'\" t
|
2
2
|
.\" Title: git-cl
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
|
-
.\" Generator: DocBook XSL Stylesheets v1.
|
5
|
-
.\" Date:
|
4
|
+
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
|
5
|
+
.\" Date: 06/21/2017
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools 0867192e
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-CL" "1" "
|
10
|
+
.TH "GIT\-CL" "1" "06/21/2017" "depot_tools 0867192e" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -1,13 +1,13 @@
|
|
1
1
|
'\" t
|
2
2
|
.\" Title: git-drover
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
|
-
.\" Generator: DocBook XSL Stylesheets v1.
|
5
|
-
.\" Date:
|
4
|
+
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
|
5
|
+
.\" Date: 06/21/2017
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools 0867192e
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-DROVER" "1" "
|
10
|
+
.TH "GIT\-DROVER" "1" "06/21/2017" "depot_tools 0867192e" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -101,7 +101,7 @@ Before working with branches, you must \fIgclient sync \-\-with_branch_heads\fR
|
|
101
101
|
.nf
|
102
102
|
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
|
103
103
|
\fB$ git log \-n 1 \-\-pretty=fuller\fR
|
104
|
-
commit
|
104
|
+
commit 386bdd1dc15d367d7c33aa5d2ae5d10eb4b278bf
|
105
105
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
106
106
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
107
107
|
Commit: some\&.committer <some\&.committer@chromium\&.org>
|
@@ -110,10 +110,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
110
110
|
This change needs to go to branch 9999
|
111
111
|
|
112
112
|
# Now do the \*(Aqdrover\*(Aq\&.
|
113
|
-
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick
|
113
|
+
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 386bdd1dc15d367d7c33aa5d2ae5d10eb4b278bf\fR
|
114
114
|
Going to cherry\-pick
|
115
115
|
"""
|
116
|
-
commit
|
116
|
+
commit 386bdd1dc15d367d7c33aa5d2ae5d10eb4b278bf
|
117
117
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
118
118
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
119
119
|
|
@@ -148,7 +148,7 @@ About to land on 9999\&. Continue (y/n)? y
|
|
148
148
|
.nf
|
149
149
|
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
|
150
150
|
\fB$ git log \-n 1 \-\-pretty=fuller\fR
|
151
|
-
commit
|
151
|
+
commit 870faa8f7621b82b98e2e9a29056dff1fbf6b713
|
152
152
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
153
153
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
154
154
|
Commit: some\&.committer <some\&.committer@chromium\&.org>
|
@@ -157,10 +157,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
157
157
|
This change needs to go to branch 9999
|
158
158
|
|
159
159
|
# Now do the \*(Aqdrover\*(Aq\&.
|
160
|
-
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick
|
160
|
+
\fB$ git drover \-\-branch 9999 \-\-cherry\-pick 870faa8f7621b82b98e2e9a29056dff1fbf6b713\fR
|
161
161
|
Going to cherry\-pick
|
162
162
|
"""
|
163
|
-
commit
|
163
|
+
commit 870faa8f7621b82b98e2e9a29056dff1fbf6b713
|
164
164
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
165
165
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
166
166
|
|
@@ -215,28 +215,28 @@ About to land on 9999\&. Continue (y/n)? y
|
|
215
215
|
|
216
216
|
# Checkout the branch with the change we want to revert\&.
|
217
217
|
\fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
|
218
|
-
Branch
|
218
|
+
Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
|
219
219
|
|
220
220
|
# Here\*(Aqs the commit we want to revert\&.
|
221
221
|
\fB$ git log \-n 1\fR
|
222
|
-
commit
|
222
|
+
commit 7066f3820fe39e50400b9d406a394117f807538e
|
223
223
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
224
224
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
225
225
|
|
226
226
|
This change is horribly broken\&.
|
227
227
|
|
228
228
|
# Now do the revert\&.
|
229
|
-
\fB$ git revert
|
229
|
+
\fB$ git revert 7066f3820fe39e50400b9d406a394117f807538e\fR
|
230
230
|
|
231
231
|
# That reverted the change and committed the revert\&.
|
232
232
|
\fB$ git log \-n 1\fR
|
233
|
-
commit
|
233
|
+
commit 13e37b2a88d8fcd4ca4a55a4db27c619345f8396
|
234
234
|
Author: you <you@chromium\&.org>
|
235
235
|
Date: Thu Apr 10 09:11:36 2014 +0000
|
236
236
|
|
237
237
|
Revert "This change is horribly broken\&."
|
238
238
|
|
239
|
-
This reverts commit
|
239
|
+
This reverts commit 7066f3820fe39e50400b9d406a394117f807538e\&.
|
240
240
|
|
241
241
|
# As with old drover, reverts are generally OK to commit without LGTM\&.
|
242
242
|
\fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR
|
@@ -269,7 +269,7 @@ If your cherrypick onto a release branch gets reverted, do not create a new cher
|
|
269
269
|
|
270
270
|
# Here\*(Aqs a commit (from some\&.committer) that we want to \*(Aqdrover\*(Aq\&.
|
271
271
|
\fB$ git log \-n 1 \-\-pretty=fuller\fR
|
272
|
-
commit
|
272
|
+
commit 54631489ecf24a4ae3f5a12c393619a717cee85a
|
273
273
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
274
274
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
275
275
|
Commit: some\&.committer <some\&.committer@chromium\&.org>
|
@@ -279,12 +279,12 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
279
279
|
|
280
280
|
# Checkout the branch we want to \*(Aqdrover\*(Aq to\&.
|
281
281
|
\fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
|
282
|
-
Branch
|
282
|
+
Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
|
283
283
|
|
284
284
|
# Now do the \*(Aqdrover\*(Aq\&.
|
285
285
|
# IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag
|
286
|
-
\fB$ git cherry\-pick \-x
|
287
|
-
[drover_9999
|
286
|
+
\fB$ git cherry\-pick \-x 54631489ecf24a4ae3f5a12c393619a717cee85a\fR
|
287
|
+
[drover_9999 56188f1] This change needs to go to branch 9999
|
288
288
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
289
289
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
290
290
|
1 file changed, 1 insertion(+)
|
@@ -293,7 +293,7 @@ Branch \*(Aqdrover_9999\*(Aq set up to track remote ref \*(Aqrefs/branch\-heads/
|
|
293
293
|
# That took the code authored by some\&.committer and committed it to
|
294
294
|
# the branch by the person who drovered it (i\&.e\&. you)\&.
|
295
295
|
\fB$ git log \-n 1 \-\-pretty=fuller\fR
|
296
|
-
commit
|
296
|
+
commit 56188f1e5b44b5ce95394d41912e980bccca8cc2
|
297
297
|
Author: some\&.committer <some\&.committer@chromium\&.org>
|
298
298
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
299
299
|
Commit: you <you@chromium\&.org>
|
@@ -301,7 +301,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
|
|
301
301
|
|
302
302
|
This change needs to go to branch 9999
|
303
303
|
|
304
|
-
(cherry picked from commit
|
304
|
+
(cherry picked from commit 54631489ecf24a4ae3f5a12c393619a717cee85a)
|
305
305
|
|
306
306
|
# Looks good\&. Ship it!
|
307
307
|
\fB$ git cl upload\fR
|
@@ -1,13 +1,13 @@
|
|
1
1
|
'\" t
|
2
2
|
.\" Title: git-footers
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
|
-
.\" Generator: DocBook XSL Stylesheets v1.
|
5
|
-
.\" Date:
|
4
|
+
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
|
5
|
+
.\" Date: 12/15/2016
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools f72f1ad
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-FOOTERS" "1" "
|
10
|
+
.TH "GIT\-FOOTERS" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -1,13 +1,13 @@
|
|
1
1
|
'\" t
|
2
2
|
.\" Title: git-freeze
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
|
-
.\" Generator: DocBook XSL Stylesheets v1.
|
5
|
-
.\" Date:
|
4
|
+
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
|
5
|
+
.\" Date: 12/15/2016
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools f72f1ad
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-FREEZE" "1" "
|
10
|
+
.TH "GIT\-FREEZE" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -60,7 +60,7 @@ D deleted_file
|
|
60
60
|
\fB$ git freeze\fR
|
61
61
|
\fB$ git status \-\-short\fR
|
62
62
|
\fB$ git log \-n 2 \-\-stat\fR
|
63
|
-
commit
|
63
|
+
commit ba39366fbf53c9501a8649a09d82f7823d22ebd8
|
64
64
|
Author: local <local@chromium\&.org>
|
65
65
|
Date: Thu Apr 10 08:54:56 2014 +0000
|
66
66
|
|
@@ -72,7 +72,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
|
|
72
72
|
unstaged_deleted_file | 1 \-
|
73
73
|
4 files changed, 2 insertions(+), 1 deletion(\-)
|
74
74
|
|
75
|
-
commit
|
75
|
+
commit 6071396fbc51599932099e642d49fd66db8abcb4
|
76
76
|
Author: local <local@chromium\&.org>
|
77
77
|
Date: Thu Apr 10 08:54:56 2014 +0000
|
78
78
|
|
@@ -1,13 +1,13 @@
|
|
1
1
|
'\" t
|
2
2
|
.\" Title: git-hyper-blame
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
|
-
.\" Generator: DocBook XSL Stylesheets v1.
|
5
|
-
.\" Date:
|
4
|
+
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
|
5
|
+
.\" Date: 12/15/2016
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools f72f1ad
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-HYPER\-BLAME" "1" "
|
10
|
+
.TH "GIT\-HYPER\-BLAME" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -2,12 +2,12 @@
|
|
2
2
|
.\" Title: git-map-branches
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
4
|
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
|
5
|
-
.\" Date:
|
5
|
+
.\" Date: 12/04/2018
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools 3edf049e
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-MAP\-BRANCHES" "1" "
|
10
|
+
.TH "GIT\-MAP\-BRANCHES" "1" "12/04/2018" "depot_tools 3edf049e" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -174,7 +174,7 @@ $ git map\-branches \-v\fR
|
|
174
174
|
origin/master
|
175
175
|
cool_feature [ ahead 4 ]
|
176
176
|
subfeature [ ahead 2 | behind 1 ]
|
177
|
-
fixit [ ahead
|
177
|
+
fixit [ ahead 6 ]
|
178
178
|
\fB frozen_branch * [ ahead 3 ]\fR
|
179
179
|
.fi
|
180
180
|
.if n \{\
|
@@ -1,13 +1,13 @@
|
|
1
1
|
'\" t
|
2
2
|
.\" Title: git-map
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
|
-
.\" Generator: DocBook XSL Stylesheets v1.
|
5
|
-
.\" Date:
|
4
|
+
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
|
5
|
+
.\" Date: 12/15/2016
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools f72f1ad
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-MAP" "1" "
|
10
|
+
.TH "GIT\-MAP" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -1,13 +1,13 @@
|
|
1
1
|
'\" t
|
2
2
|
.\" Title: git-mark-merge-base
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
|
-
.\" Generator: DocBook XSL Stylesheets v1.
|
5
|
-
.\" Date:
|
4
|
+
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
|
5
|
+
.\" Date: 12/15/2016
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools f72f1ad
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-MARK\-MERGE\-BA" "1" "
|
10
|
+
.TH "GIT\-MARK\-MERGE\-BA" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -1,13 +1,13 @@
|
|
1
1
|
'\" t
|
2
2
|
.\" Title: git-nav-downstream
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
|
-
.\" Generator: DocBook XSL Stylesheets v1.
|
5
|
-
.\" Date:
|
4
|
+
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
|
5
|
+
.\" Date: 12/15/2016
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools f72f1ad
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-NAV\-DOWNSTREAM" "1" "
|
10
|
+
.TH "GIT\-NAV\-DOWNSTREAM" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -53,7 +53,7 @@ git-nav-downstream \- Checkout a downstream branch of the currently checked out
|
|
53
53
|
fixit
|
54
54
|
frozen_branch
|
55
55
|
\fB$ git nav\-downstream\fR
|
56
|
-
Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
|
56
|
+
Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
|
57
57
|
Switched to branch \*(Aqcool_feature\*(Aq
|
58
58
|
Your branch is ahead of \*(Aqorigin/master\*(Aq by 4 commits\&.
|
59
59
|
(use "git push" to publish your local commits)
|
@@ -70,7 +70,7 @@ origin/master
|
|
70
70
|
\fB$ git nav\-downstream\fR
|
71
71
|
Switched to branch \*(Aqsubfeature\*(Aq
|
72
72
|
Your branch and \*(Aqcool_feature\*(Aq have diverged,
|
73
|
-
and have 2 and 1 different
|
73
|
+
and have 2 and 1 different commit each, respectively\&.
|
74
74
|
(use "git pull" to merge the remote branch into yours)
|
75
75
|
\fB$ git map\-branches\fR
|
76
76
|
origin/master
|
@@ -1,13 +1,13 @@
|
|
1
1
|
'\" t
|
2
2
|
.\" Title: git-nav-upstream
|
3
3
|
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
|
4
|
-
.\" Generator: DocBook XSL Stylesheets v1.
|
5
|
-
.\" Date:
|
4
|
+
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
|
5
|
+
.\" Date: 12/15/2016
|
6
6
|
.\" Manual: Chromium depot_tools Manual
|
7
|
-
.\" Source: depot_tools
|
7
|
+
.\" Source: depot_tools f72f1ad
|
8
8
|
.\" Language: English
|
9
9
|
.\"
|
10
|
-
.TH "GIT\-NAV\-UPSTREAM" "1" "
|
10
|
+
.TH "GIT\-NAV\-UPSTREAM" "1" "12/15/2016" "depot_tools f72f1ad" "Chromium depot_tools Manual"
|
11
11
|
.\" -----------------------------------------------------------------
|
12
12
|
.\" * Define some portability stuff
|
13
13
|
.\" -----------------------------------------------------------------
|
@@ -63,24 +63,18 @@ origin/master
|
|
63
63
|
fixit
|
64
64
|
frozen_branch
|
65
65
|
\fB$ git nav\-upstream\fR
|
66
|
-
Note:
|
66
|
+
Note: checking out \*(Aqorigin/master\*(Aq\&.
|
67
67
|
|
68
68
|
You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experimental \fB(1)\fR
|
69
69
|
changes and commit them, and you can discard any commits you make in this
|
70
|
-
state without impacting any branches by
|
70
|
+
state without impacting any branches by performing another checkout\&.
|
71
71
|
|
72
72
|
If you want to create a new branch to retain commits you create, you may
|
73
|
-
do so (now or later) by using \-
|
73
|
+
do so (now or later) by using \-b with the checkout command again\&. Example:
|
74
74
|
|
75
|
-
git
|
75
|
+
git checkout \-b <new\-branch\-name>
|
76
76
|
|
77
|
-
|
78
|
-
|
79
|
-
git switch \-
|
80
|
-
|
81
|
-
Turn off this advice by setting config variable advice\&.detachedHead to false
|
82
|
-
|
83
|
-
HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
|
77
|
+
HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
|
84
78
|
\fB$ git map\-branches\fR
|
85
79
|
\fBorigin/master
|
86
80
|
\fR cool_feature
|