1
+ < ?xml version="1.0" encoding="UTF-8"?>
1
2
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2
3
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3
4
< html xmlns ="http://www.w3.org/1999/xhtml " xml:lang ="en ">
4
5
< head >
5
6
< meta http-equiv ="Content-Type " content ="application/xhtml+xml; charset=UTF-8 " />
6
- < meta name ="generator " content ="AsciiDoc 8.6.9 " />
7
+ < meta name ="generator " content ="AsciiDoc 9.1.0 " />
7
8
< title > git-drover(1)</ title >
8
9
< style type ="text/css ">
9
10
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
435
436
p .table {
436
437
margin-top : 0 ;
437
438
}
438
- /* Because the table frame attribute is overriden by CSS in most browsers. */
439
+ /* Because the table frame attribute is overridden by CSS in most browsers. */
439
440
div .tableblock > table [frame = "void" ] {
440
441
border-style : none;
441
442
}
@@ -858,7 +859,7 @@ <h3 id="_prerequisites">PREREQUISITES</h3>
858
859
< h4 id ="_merge_example "> Merge Example</ h4 >
859
860
< div class ="paragraph "> < p > </ p > </ div > < div class ="listingblock "> < div class ="content "> < pre > < code > # Here's a commit (from some.committer) that we want to 'drover'.
860
861
< span style ="font-weight: bold; color: #ffffff "> $ git log -n 1 --pretty=fuller</ span >
861
- < span style ="color: #e7e71c "> commit c980d966aab8516cc651409da4bf21ca8a4a3613 </ span >
862
+ < span style ="color: #e7e71c "> commit 62472550afc1d8c317c49bdda05a241e1477e438 </ span >
862
863
Author: some.committer <
[email protected] >
863
864
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
864
865
Commit: some.committer <
[email protected] >
@@ -867,10 +868,10 @@ <h4 id="_merge_example">Merge Example</h4>
867
868
This change needs to go to branch 9999
868
869
869
870
# Now do the 'drover'.
870
- < span style ="font-weight: bold; color: #ffffff "> $ git drover --branch 9999 --cherry-pick c980d966aab8516cc651409da4bf21ca8a4a3613 </ span >
871
+ < span style ="font-weight: bold; color: #ffffff "> $ git drover --branch 9999 --cherry-pick 62472550afc1d8c317c49bdda05a241e1477e438 </ span >
871
872
Going to cherry-pick
872
873
"""
873
- < span style ="color: #e7e71c "> commit c980d966aab8516cc651409da4bf21ca8a4a3613 </ span >
874
+ < span style ="color: #e7e71c "> commit 62472550afc1d8c317c49bdda05a241e1477e438 </ span >
874
875
Author: some.committer <
[email protected] >
875
876
Date: Thu Apr 10 08:54:46 2014 +0000
876
877
@@ -888,7 +889,7 @@ <h4 id="_merge_example">Merge Example</h4>
888
889
< h4 id ="_merge_with_conflicts_example "> Merge with Conflicts Example</ h4 >
889
890
< div class ="paragraph "> < p > </ p > </ div > < div class ="listingblock "> < div class ="content "> < pre > < code > # Here's a commit (from some.committer) that we want to 'drover'.
890
891
< span style ="font-weight: bold; color: #ffffff "> $ git log -n 1 --pretty=fuller</ span >
891
- < span style ="color: #e7e71c "> commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174 </ span >
892
+ < span style ="color: #e7e71c "> commit 7fd5f30fcbf6010bb579794d3080ea37d050b26d </ span >
892
893
Author: some.committer <
[email protected] >
893
894
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
894
895
Commit: some.committer <
[email protected] >
@@ -897,10 +898,10 @@ <h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
897
898
This change needs to go to branch 9999
898
899
899
900
# Now do the 'drover'.
900
- < span style ="font-weight: bold; color: #ffffff "> $ git drover --branch 9999 --cherry-pick 2d78cf765179c7be5e7e6d1e4565a0d3769e9174 </ span >
901
+ < span style ="font-weight: bold; color: #ffffff "> $ git drover --branch 9999 --cherry-pick 7fd5f30fcbf6010bb579794d3080ea37d050b26d </ span >
901
902
Going to cherry-pick
902
903
"""
903
- < span style ="color: #e7e71c "> commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174 </ span >
904
+ < span style ="color: #e7e71c "> commit 7fd5f30fcbf6010bb579794d3080ea37d050b26d </ span >
904
905
Author: some.committer <
[email protected] >
905
906
Date: Thu Apr 10 08:54:46 2014 +0000
906
907
@@ -942,24 +943,24 @@ <h4 id="_revert_example">Revert Example</h4>
942
943
943
944
# Here's the commit we want to revert.
944
945
< span style ="font-weight: bold; color: #ffffff "> $ git log -n 1</ span >
945
- < span style ="color: #e7e71c "> commit 54f88a53372983c7aecacfb9a4d2fa63501fda58 </ span >
946
+ < span style ="color: #e7e71c "> commit fe52372519f5152cb7198467ed1a4f3c6f2bd8e5 </ span >
946
947
Author: some.committer <
[email protected] >
947
948
Date: Thu Apr 10 08:54:46 2014 +0000
948
949
949
950
This change is horribly broken.
950
951
951
952
# Now do the revert.
952
- < span style ="font-weight: bold; color: #ffffff "> $ git revert 54f88a53372983c7aecacfb9a4d2fa63501fda58 </ span >
953
+ < span style ="font-weight: bold; color: #ffffff "> $ git revert fe52372519f5152cb7198467ed1a4f3c6f2bd8e5 </ span >
953
954
954
955
# That reverted the change and committed the revert.
955
956
< span style ="font-weight: bold; color: #ffffff "> $ git log -n 1</ span >
956
- < span style ="color: #e7e71c "> commit 4d932bdd1071e318e6a4d3d6fd6034f9105cad5a </ span >
957
+ < span style ="color: #e7e71c "> commit 72fef2931683370c31c218f114deed6f507df942 </ span >
957
958
Author: you <
[email protected] >
958
959
Date: Thu Apr 10 09:11:36 2014 +0000
959
960
960
961
Revert "This change is horribly broken."
961
962
962
- This reverts commit 54f88a53372983c7aecacfb9a4d2fa63501fda58 .
963
+ This reverts commit fe52372519f5152cb7198467ed1a4f3c6f2bd8e5 .
963
964
964
965
# As with old drover, reverts are generally OK to commit without LGTM.
965
966
< span style ="
font-weight: bold; color: #ffffff "
> $ git cl upload -r
[email protected] --send-mail
</ span >
@@ -976,7 +977,7 @@ <h4 id="_manual_merge_example">Manual Merge Example</h4>
976
977
977
978
# Here's a commit (from some.committer) that we want to 'drover'.
978
979
< span style ="font-weight: bold; color: #ffffff "> $ git log -n 1 --pretty=fuller</ span >
979
- < span style ="color: #e7e71c "> commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a </ span >
980
+ < span style ="color: #e7e71c "> commit 068a64822d90ab3b918425679816aee2d9be1e24 </ span >
980
981
Author: some.committer <
[email protected] >
981
982
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
982
983
Commit: some.committer <
[email protected] >
@@ -990,8 +991,8 @@ <h4 id="_manual_merge_example">Manual Merge Example</h4>
990
991
991
992
# Now do the 'drover'.
992
993
# IMPORTANT!!! Do Not leave off the '-x' flag
993
- < span style ="font-weight: bold; color: #ffffff "> $ git cherry-pick -x 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a </ span >
994
- [drover_9999 77a956b ] This change needs to go to branch 9999
994
+ < span style ="font-weight: bold; color: #ffffff "> $ git cherry-pick -x 068a64822d90ab3b918425679816aee2d9be1e24 </ span >
995
+ [drover_9999 cda4a18 ] This change needs to go to branch 9999
995
996
Author: some.committer <
[email protected] >
996
997
Date: Thu Apr 10 08:54:46 2014 +0000
997
998
1 file changed, 1 insertion(+)
@@ -1000,15 +1001,15 @@ <h4 id="_manual_merge_example">Manual Merge Example</h4>
1000
1001
# That took the code authored by some.committer and committed it to
1001
1002
# the branch by the person who drovered it (i.e. you).
1002
1003
< span style ="font-weight: bold; color: #ffffff "> $ git log -n 1 --pretty=fuller</ span >
1003
- < span style ="color: #e7e71c "> commit 77a956ba0f28eb29ed009f58a5d71b6a10283358 </ span >
1004
+ < span style ="color: #e7e71c "> commit cda4a18321ef3f603e955da6e263b6cadff11885 </ span >
1004
1005
Author: some.committer <
[email protected] >
1005
1006
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
1006
1007
Commit: you <
[email protected] >
1007
1008
CommitDate: Thu Apr 10 09:11:36 2014 +0000
1008
1009
1009
1010
This change needs to go to branch 9999
1010
1011
1011
- (cherry picked from commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a )
1012
+ (cherry picked from commit 068a64822d90ab3b918425679816aee2d9be1e24 )
1012
1013
1013
1014
# Looks good. Ship it!
1014
1015
< span style ="font-weight: bold; color: #ffffff "> $ git cl upload</ span >
@@ -1041,7 +1042,8 @@ <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
1041
1042
< div id ="footnotes "> < hr /> </ div >
1042
1043
< div id ="footer ">
1043
1044
< div id ="footer-text ">
1044
- Last updated 2020-08-10 17:51:13 CEST
1045
+ Last updated
1046
+ 2021-07-01 07:07:00 PDT
1045
1047
</ div >
1046
1048
</ div >
1047
1049
</ body >
0 commit comments