You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1045 lines
26 KiB
HTML
1045 lines
26 KiB
HTML
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
|
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
|
<head>
|
|
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
|
|
<meta name="generator" content="AsciiDoc 8.6.9" />
|
|
<title>git-drover(1)</title>
|
|
<style type="text/css">
|
|
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
|
|
|
|
/* Default font. */
|
|
body {
|
|
font-family: Georgia,serif;
|
|
}
|
|
|
|
/* Title font. */
|
|
h1, h2, h3, h4, h5, h6,
|
|
div.title, caption.title,
|
|
thead, p.table.header,
|
|
#toctitle,
|
|
#author, #revnumber, #revdate, #revremark,
|
|
#footer {
|
|
font-family: Arial,Helvetica,sans-serif;
|
|
}
|
|
|
|
body {
|
|
margin: 1em 5% 1em 5%;
|
|
}
|
|
|
|
a {
|
|
color: blue;
|
|
text-decoration: underline;
|
|
}
|
|
a:visited {
|
|
color: fuchsia;
|
|
}
|
|
|
|
em {
|
|
font-style: italic;
|
|
color: navy;
|
|
}
|
|
|
|
strong {
|
|
font-weight: bold;
|
|
color: #083194;
|
|
}
|
|
|
|
h1, h2, h3, h4, h5, h6 {
|
|
color: #527bbd;
|
|
margin-top: 1.2em;
|
|
margin-bottom: 0.5em;
|
|
line-height: 1.3;
|
|
}
|
|
|
|
h1, h2, h3 {
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
h2 {
|
|
padding-top: 0.5em;
|
|
}
|
|
h3 {
|
|
float: left;
|
|
}
|
|
h3 + * {
|
|
clear: left;
|
|
}
|
|
h5 {
|
|
font-size: 1.0em;
|
|
}
|
|
|
|
div.sectionbody {
|
|
margin-left: 0;
|
|
}
|
|
|
|
hr {
|
|
border: 1px solid silver;
|
|
}
|
|
|
|
p {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
|
|
ul, ol, li > p {
|
|
margin-top: 0;
|
|
}
|
|
ul > li { color: #aaa; }
|
|
ul > li > * { color: black; }
|
|
|
|
.monospaced, code, pre {
|
|
font-family: "Courier New", Courier, monospace;
|
|
font-size: inherit;
|
|
color: navy;
|
|
padding: 0;
|
|
margin: 0;
|
|
}
|
|
pre {
|
|
white-space: pre-wrap;
|
|
}
|
|
|
|
#author {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
font-size: 1.1em;
|
|
}
|
|
#email {
|
|
}
|
|
#revnumber, #revdate, #revremark {
|
|
}
|
|
|
|
#footer {
|
|
font-size: small;
|
|
border-top: 2px solid silver;
|
|
padding-top: 0.5em;
|
|
margin-top: 4.0em;
|
|
}
|
|
#footer-text {
|
|
float: left;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
#footer-badges {
|
|
float: right;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
|
|
#preamble {
|
|
margin-top: 1.5em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.imageblock, div.exampleblock, div.verseblock,
|
|
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
|
|
div.admonitionblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.admonitionblock {
|
|
margin-top: 2.0em;
|
|
margin-bottom: 2.0em;
|
|
margin-right: 10%;
|
|
color: #606060;
|
|
}
|
|
|
|
div.content { /* Block element content. */
|
|
padding: 0;
|
|
}
|
|
|
|
/* Block element titles. */
|
|
div.title, caption.title {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
text-align: left;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
div.title + * {
|
|
margin-top: 0;
|
|
}
|
|
|
|
td div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content + div.title {
|
|
margin-top: 0.0em;
|
|
}
|
|
|
|
div.sidebarblock > div.content {
|
|
background: #ffffee;
|
|
border: 1px solid #dddddd;
|
|
border-left: 4px solid #f0f0f0;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.listingblock > div.content {
|
|
border: 1px solid #dddddd;
|
|
border-left: 5px solid #f0f0f0;
|
|
background: #f8f8f8;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.quoteblock, div.verseblock {
|
|
padding-left: 1.0em;
|
|
margin-left: 1.0em;
|
|
margin-right: 10%;
|
|
border-left: 5px solid #f0f0f0;
|
|
color: #888;
|
|
}
|
|
|
|
div.quoteblock > div.attribution {
|
|
padding-top: 0.5em;
|
|
text-align: right;
|
|
}
|
|
|
|
div.verseblock > pre.content {
|
|
font-family: inherit;
|
|
font-size: inherit;
|
|
}
|
|
div.verseblock > div.attribution {
|
|
padding-top: 0.75em;
|
|
text-align: left;
|
|
}
|
|
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
|
|
div.verseblock + div.attribution {
|
|
text-align: left;
|
|
}
|
|
|
|
div.admonitionblock .icon {
|
|
vertical-align: top;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
text-decoration: underline;
|
|
color: #527bbd;
|
|
padding-right: 0.5em;
|
|
}
|
|
div.admonitionblock td.content {
|
|
padding-left: 0.5em;
|
|
border-left: 3px solid #dddddd;
|
|
}
|
|
|
|
div.exampleblock > div.content {
|
|
border-left: 3px solid #dddddd;
|
|
padding-left: 0.5em;
|
|
}
|
|
|
|
div.imageblock div.content { padding-left: 0; }
|
|
span.image img { border-style: none; vertical-align: text-bottom; }
|
|
a.image:visited { color: white; }
|
|
|
|
dl {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
dt {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0;
|
|
font-style: normal;
|
|
color: navy;
|
|
}
|
|
dd > *:first-child {
|
|
margin-top: 0.1em;
|
|
}
|
|
|
|
ul, ol {
|
|
list-style-position: outside;
|
|
}
|
|
ol.arabic {
|
|
list-style-type: decimal;
|
|
}
|
|
ol.loweralpha {
|
|
list-style-type: lower-alpha;
|
|
}
|
|
ol.upperalpha {
|
|
list-style-type: upper-alpha;
|
|
}
|
|
ol.lowerroman {
|
|
list-style-type: lower-roman;
|
|
}
|
|
ol.upperroman {
|
|
list-style-type: upper-roman;
|
|
}
|
|
|
|
div.compact ul, div.compact ol,
|
|
div.compact p, div.compact p,
|
|
div.compact div, div.compact div {
|
|
margin-top: 0.1em;
|
|
margin-bottom: 0.1em;
|
|
}
|
|
|
|
tfoot {
|
|
font-weight: bold;
|
|
}
|
|
td > div.verse {
|
|
white-space: pre;
|
|
}
|
|
|
|
div.hdlist {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
div.hdlist tr {
|
|
padding-bottom: 15px;
|
|
}
|
|
dt.hdlist1.strong, td.hdlist1.strong {
|
|
font-weight: bold;
|
|
}
|
|
td.hdlist1 {
|
|
vertical-align: top;
|
|
font-style: normal;
|
|
padding-right: 0.8em;
|
|
color: navy;
|
|
}
|
|
td.hdlist2 {
|
|
vertical-align: top;
|
|
}
|
|
div.hdlist.compact tr {
|
|
margin: 0;
|
|
padding-bottom: 0;
|
|
}
|
|
|
|
.comment {
|
|
background: yellow;
|
|
}
|
|
|
|
.footnote, .footnoteref {
|
|
font-size: 0.8em;
|
|
}
|
|
|
|
span.footnote, span.footnoteref {
|
|
vertical-align: super;
|
|
}
|
|
|
|
#footnotes {
|
|
margin: 20px 0 20px 0;
|
|
padding: 7px 0 0 0;
|
|
}
|
|
|
|
#footnotes div.footnote {
|
|
margin: 0 0 5px 0;
|
|
}
|
|
|
|
#footnotes hr {
|
|
border: none;
|
|
border-top: 1px solid silver;
|
|
height: 1px;
|
|
text-align: left;
|
|
margin-left: 0;
|
|
width: 20%;
|
|
min-width: 100px;
|
|
}
|
|
|
|
div.colist td {
|
|
padding-right: 0.5em;
|
|
padding-bottom: 0.3em;
|
|
vertical-align: top;
|
|
}
|
|
div.colist td img {
|
|
margin-top: 0.3em;
|
|
}
|
|
|
|
@media print {
|
|
#footer-badges { display: none; }
|
|
}
|
|
|
|
#toc {
|
|
margin-bottom: 2.5em;
|
|
}
|
|
|
|
#toctitle {
|
|
color: #527bbd;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.1em;
|
|
}
|
|
|
|
div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
|
|
margin-top: 0;
|
|
margin-bottom: 0;
|
|
}
|
|
div.toclevel2 {
|
|
margin-left: 2em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel3 {
|
|
margin-left: 4em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel4 {
|
|
margin-left: 6em;
|
|
font-size: 0.9em;
|
|
}
|
|
|
|
span.aqua { color: aqua; }
|
|
span.black { color: black; }
|
|
span.blue { color: blue; }
|
|
span.fuchsia { color: fuchsia; }
|
|
span.gray { color: gray; }
|
|
span.green { color: green; }
|
|
span.lime { color: lime; }
|
|
span.maroon { color: maroon; }
|
|
span.navy { color: navy; }
|
|
span.olive { color: olive; }
|
|
span.purple { color: purple; }
|
|
span.red { color: red; }
|
|
span.silver { color: silver; }
|
|
span.teal { color: teal; }
|
|
span.white { color: white; }
|
|
span.yellow { color: yellow; }
|
|
|
|
span.aqua-background { background: aqua; }
|
|
span.black-background { background: black; }
|
|
span.blue-background { background: blue; }
|
|
span.fuchsia-background { background: fuchsia; }
|
|
span.gray-background { background: gray; }
|
|
span.green-background { background: green; }
|
|
span.lime-background { background: lime; }
|
|
span.maroon-background { background: maroon; }
|
|
span.navy-background { background: navy; }
|
|
span.olive-background { background: olive; }
|
|
span.purple-background { background: purple; }
|
|
span.red-background { background: red; }
|
|
span.silver-background { background: silver; }
|
|
span.teal-background { background: teal; }
|
|
span.white-background { background: white; }
|
|
span.yellow-background { background: yellow; }
|
|
|
|
span.big { font-size: 2em; }
|
|
span.small { font-size: 0.6em; }
|
|
|
|
span.underline { text-decoration: underline; }
|
|
span.overline { text-decoration: overline; }
|
|
span.line-through { text-decoration: line-through; }
|
|
|
|
div.unbreakable { page-break-inside: avoid; }
|
|
|
|
|
|
/*
|
|
* xhtml11 specific
|
|
*
|
|
* */
|
|
|
|
div.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.tableblock > table {
|
|
border: 3px solid #527bbd;
|
|
}
|
|
thead, p.table.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.table {
|
|
margin-top: 0;
|
|
}
|
|
/* Because the table frame attribute is overriden by CSS in most browsers. */
|
|
div.tableblock > table[frame="void"] {
|
|
border-style: none;
|
|
}
|
|
div.tableblock > table[frame="hsides"] {
|
|
border-left-style: none;
|
|
border-right-style: none;
|
|
}
|
|
div.tableblock > table[frame="vsides"] {
|
|
border-top-style: none;
|
|
border-bottom-style: none;
|
|
}
|
|
|
|
|
|
/*
|
|
* html5 specific
|
|
*
|
|
* */
|
|
|
|
table.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
thead, p.tableblock.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.tableblock {
|
|
margin-top: 0;
|
|
}
|
|
table.tableblock {
|
|
border-width: 3px;
|
|
border-spacing: 0px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
border-collapse: collapse;
|
|
}
|
|
th.tableblock, td.tableblock {
|
|
border-width: 1px;
|
|
padding: 4px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
}
|
|
|
|
table.tableblock.frame-topbot {
|
|
border-left-style: hidden;
|
|
border-right-style: hidden;
|
|
}
|
|
table.tableblock.frame-sides {
|
|
border-top-style: hidden;
|
|
border-bottom-style: hidden;
|
|
}
|
|
table.tableblock.frame-none {
|
|
border-style: hidden;
|
|
}
|
|
|
|
th.tableblock.halign-left, td.tableblock.halign-left {
|
|
text-align: left;
|
|
}
|
|
th.tableblock.halign-center, td.tableblock.halign-center {
|
|
text-align: center;
|
|
}
|
|
th.tableblock.halign-right, td.tableblock.halign-right {
|
|
text-align: right;
|
|
}
|
|
|
|
th.tableblock.valign-top, td.tableblock.valign-top {
|
|
vertical-align: top;
|
|
}
|
|
th.tableblock.valign-middle, td.tableblock.valign-middle {
|
|
vertical-align: middle;
|
|
}
|
|
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
|
|
vertical-align: bottom;
|
|
}
|
|
|
|
|
|
/*
|
|
* manpage specific
|
|
*
|
|
* */
|
|
|
|
body.manpage h1 {
|
|
padding-top: 0.5em;
|
|
padding-bottom: 0.5em;
|
|
border-top: 2px solid silver;
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
body.manpage h2 {
|
|
border-style: none;
|
|
}
|
|
body.manpage div.sectionbody {
|
|
margin-left: 3em;
|
|
}
|
|
|
|
@media print {
|
|
body.manpage div#toc { display: none; }
|
|
}
|
|
|
|
|
|
div.listingblock > div.content {
|
|
background: rgb(28, 28, 28);
|
|
}
|
|
|
|
div.listingblock > div > pre > code {
|
|
color: rgb(187, 187, 187);
|
|
}
|
|
</style>
|
|
<script type="text/javascript">
|
|
/*<+'])');
|
|
// Function that scans the DOM tree for header elements (the DOM2
|
|
// nodeIterator API would be a better technique but not supported by all
|
|
// browsers).
|
|
var iterate = function (el) {
|
|
for (var i = el.firstChild; i != null; i = i.nextSibling) {
|
|
if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
|
|
var mo = re.exec(i.tagName);
|
|
if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
|
|
result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
|
|
}
|
|
iterate(i);
|
|
}
|
|
}
|
|
}
|
|
iterate(el);
|
|
return result;
|
|
}
|
|
|
|
var toc = document.getElementById("toc");
|
|
if (!toc) {
|
|
return;
|
|
}
|
|
|
|
// Delete existing TOC entries in case we're reloading the TOC.
|
|
var tocEntriesToRemove = [];
|
|
var i;
|
|
for (i = 0; i < toc.childNodes.length; i++) {
|
|
var entry = toc.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div'
|
|
&& entry.getAttribute("class")
|
|
&& entry.getAttribute("class").match(/^toclevel/))
|
|
tocEntriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < tocEntriesToRemove.length; i++) {
|
|
toc.removeChild(tocEntriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild TOC entries.
|
|
var entries = tocEntries(document.getElementById("content"), toclevels);
|
|
for (var i = 0; i < entries.length; ++i) {
|
|
var entry = entries[i];
|
|
if (entry.element.id == "")
|
|
entry.element.id = "_toc_" + i;
|
|
var a = document.createElement("a");
|
|
a.href = "#" + entry.element.id;
|
|
a.appendChild(document.createTextNode(entry.text));
|
|
var div = document.createElement("div");
|
|
div.appendChild(a);
|
|
div.className = "toclevel" + entry.toclevel;
|
|
toc.appendChild(div);
|
|
}
|
|
if (entries.length == 0)
|
|
toc.parentNode.removeChild(toc);
|
|
},
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// Footnotes generator
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
/* Based on footnote generation code from:
|
|
* http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
|
|
*/
|
|
|
|
footnotes: function () {
|
|
// Delete existing footnote entries in case we're reloading the footnodes.
|
|
var i;
|
|
var noteholder = document.getElementById("footnotes");
|
|
if (!noteholder) {
|
|
return;
|
|
}
|
|
var entriesToRemove = [];
|
|
for (i = 0; i < noteholder.childNodes.length; i++) {
|
|
var entry = noteholder.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
|
|
entriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < entriesToRemove.length; i++) {
|
|
noteholder.removeChild(entriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild footnote entries.
|
|
var cont = document.getElementById("content");
|
|
var spans = cont.getElementsByTagName("span");
|
|
var refs = {};
|
|
var n = 0;
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnote") {
|
|
n++;
|
|
var note = spans[i].getAttribute("data-note");
|
|
if (!note) {
|
|
// Use [\s\S] in place of . so multi-line matches work.
|
|
// Because JavaScript has no s (dotall) regex flag.
|
|
note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
|
|
spans[i].innerHTML =
|
|
"[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
spans[i].setAttribute("data-note", note);
|
|
}
|
|
noteholder.innerHTML +=
|
|
"<div class='footnote' id='_footnote_" + n + "'>" +
|
|
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
|
|
n + "</a>. " + note + "</div>";
|
|
var id =spans[i].getAttribute("id");
|
|
if (id != null) refs["#"+id] = n;
|
|
}
|
|
}
|
|
if (n == 0)
|
|
noteholder.parentNode.removeChild(noteholder);
|
|
else {
|
|
// Process footnoterefs.
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnoteref") {
|
|
var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
|
|
href = href.match(/#.*/)[0]; // Because IE return full URL.
|
|
n = refs[href];
|
|
spans[i].innerHTML =
|
|
"[<a href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
}
|
|
}
|
|
}
|
|
},
|
|
|
|
install: function(toclevels) {
|
|
var timerId;
|
|
|
|
function reinstall() {
|
|
asciidoc.footnotes();
|
|
if (toclevels) {
|
|
asciidoc.toc(toclevels);
|
|
}
|
|
}
|
|
|
|
function reinstallAndRemoveTimer() {
|
|
clearInterval(timerId);
|
|
reinstall();
|
|
}
|
|
|
|
timerId = setInterval(reinstall, 500);
|
|
if (document.addEventListener)
|
|
document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
|
|
else
|
|
window.onload = reinstallAndRemoveTimer;
|
|
}
|
|
|
|
}
|
|
asciidoc.install();
|
|
/*]]>*/
|
|
</script>
|
|
</head>
|
|
<body class="manpage">
|
|
<div id="header">
|
|
<h1>
|
|
git-drover(1) Manual Page
|
|
</h1>
|
|
<h2>NAME</h2>
|
|
<div class="sectionbody">
|
|
<p>git-drover -
|
|
Apply a commit from the trunk to a release branch, or from one release branch to another.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div id="content">
|
|
<div class="sect1">
|
|
<h2 id="_synopsis">SYNOPSIS</h2>
|
|
<div class="sectionbody">
|
|
<div class="verseblock">
|
|
<pre class="content"><em>git drover</em> --branch <branch>
|
|
(--cherry-pick <change> | --continue [path_to_workdir] |
|
|
--abort [path_to_workdir])
|
|
[--parent_checkout <path-to-existing-checkout>]
|
|
[--verbose] [--dry-run]</pre>
|
|
<div class="attribution">
|
|
</div></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_description">DESCRIPTION</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p><code>git drover</code> applies a commit to a release branch. It creates a new workdir from
|
|
an existing checkout to avoid downloading a new checkout without affecting the
|
|
existing checkout.</p></div>
|
|
<div class="paragraph"><p><code>git drover</code> does not support reverts. See the EXAMPLE section for the
|
|
equivalent sequence of commands to run.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_options">OPTIONS</h2>
|
|
<div class="sectionbody">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
--branch <branch>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
The branch to cherry-pick the commit to.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--cherry-pick <commit>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
The commit to cherry-pick.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--continue [path_to_workdir]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Continue a cherry-pick that required manual resolution. The path to the drover
|
|
workdir is optional. If unspecified, the current directory is used.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--abort [path_to_workdir]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Abort a cherry-pick that required manual resolution and clean up its workdir.
|
|
The path to the drover workdir is optional. If unspecified, the current
|
|
directory is used.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--parent_checkout
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
The path to the chromium checkout to use as the source for a creating
|
|
git-new-workdir workdir to use for cherry-picking. If unspecified, the current
|
|
directory is used.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-v
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--verbose
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Enable verbose logging.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--dry-run
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Skip landing the cherry-pick. Just ensure that the commit can be cherry-picked
|
|
into the branch.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_example">EXAMPLE</h2>
|
|
<div class="sectionbody">
|
|
<div class="sect2">
|
|
<h3 id="_prerequisites">PREREQUISITES</h3>
|
|
<div class="paragraph"><p>Before working with branches, you must
|
|
<code>gclient sync --with_branch_heads</code>
|
|
at least once to fetch the branches.</p></div>
|
|
<div class="sect3">
|
|
<h4 id="_merge_example">Merge Example</h4>
|
|
<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'.
|
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
|
<span style="color: #e7e71c">commit 3b3f7e1631a521457357228c2048e647c60e67bd</span>
|
|
Author: some.committer <some.committer@chromium.org>
|
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
|
Commit: some.committer <some.committer@chromium.org>
|
|
CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
|
|
This change needs to go to branch 9999
|
|
|
|
# Now do the 'drover'.
|
|
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 3b3f7e1631a521457357228c2048e647c60e67bd</span>
|
|
Going to cherry-pick
|
|
"""
|
|
<span style="color: #e7e71c">commit 3b3f7e1631a521457357228c2048e647c60e67bd</span>
|
|
Author: some.committer <some.committer@chromium.org>
|
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
|
|
|
This change needs to go to branch 9999
|
|
"""
|
|
to 9999. Continue (y/n)? y
|
|
|
|
# A cl is uploaded to rietveld, where it can be reviewed before landing.
|
|
|
|
About to land on 9999. Continue (y/n)? y
|
|
# The cherry-pick cl is landed on the branch 9999.
|
|
</code></pre></div></div><p><div class="paragraph"></p></div>
|
|
</div>
|
|
<div class="sect3">
|
|
<h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
|
|
<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'.
|
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
|
<span style="color: #e7e71c">commit 28f2d8f22642366b09afa8ea2d4ef6ea6de2f662</span>
|
|
Author: some.committer <some.committer@chromium.org>
|
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
|
Commit: some.committer <some.committer@chromium.org>
|
|
CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
|
|
This change needs to go to branch 9999
|
|
|
|
# Now do the 'drover'.
|
|
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 28f2d8f22642366b09afa8ea2d4ef6ea6de2f662</span>
|
|
Going to cherry-pick
|
|
"""
|
|
<span style="color: #e7e71c">commit 28f2d8f22642366b09afa8ea2d4ef6ea6de2f662</span>
|
|
Author: some.committer <some.committer@chromium.org>
|
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
|
|
|
This change needs to go to branch 9999
|
|
"""
|
|
to 9999. Continue (y/n)? y
|
|
|
|
Error: Patch failed to apply.
|
|
|
|
A workdir for this cherry-pick has been created in
|
|
/tmp/drover_9999
|
|
|
|
To continue, resolve the conflicts there and run
|
|
git drover --continue /tmp/drover_9999
|
|
|
|
To abort this cherry-pick run
|
|
git drover --abort /tmp/drover_9999
|
|
|
|
<span style="font-weight: bold; color: #ffffff">$ pushd /tmp/drover_9999</span>
|
|
# Manually resolve conflicts.
|
|
<span style="font-weight: bold; color: #ffffff">$ git add path/to/file_with_conflicts</span>
|
|
<span style="font-weight: bold; color: #ffffff">$ popd</span>
|
|
<span style="font-weight: bold; color: #ffffff">$ git drover --continue /tmp/drover_9999</span>
|
|
|
|
# A cl is uploaded to rietveld, where it can be reviewed before landing.
|
|
|
|
About to land on 9999. Continue (y/n)? y
|
|
# The cherry-pick cl is landed on the branch 9999.
|
|
</code></pre></div></div><p><div class="paragraph"></p></div>
|
|
</div>
|
|
<div class="sect3">
|
|
<h4 id="_revert_example">Revert Example</h4>
|
|
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Make sure we have the most up-to-date branch sources.
|
|
<span style="font-weight: bold; color: #ffffff">$ git fetch</span>
|
|
|
|
# Checkout the branch with the change we want to revert.
|
|
<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
|
|
Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
|
|
|
|
# Here's the commit we want to revert.
|
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
|
|
<span style="color: #e7e71c">commit 302334dbd2dca060814ffd3567808f2beafbf647</span>
|
|
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.
|
|
<span style="font-weight: bold; color: #ffffff">$ git revert 302334dbd2dca060814ffd3567808f2beafbf647</span>
|
|
|
|
# That reverted the change and committed the revert.
|
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
|
|
<span style="color: #e7e71c">commit dd4742441d71cf2b8f403ff9ca819b3201de3c5b</span>
|
|
Author: you <you@chromium.org>
|
|
Date: Thu Apr 10 09:11:36 2014 +0000
|
|
|
|
Revert "This change is horribly broken."
|
|
|
|
This reverts commit 302334dbd2dca060814ffd3567808f2beafbf647.
|
|
|
|
# As with old drover, reverts are generally OK to commit without LGTM.
|
|
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committer@chromium.org --send-mail</span>
|
|
<span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</span>
|
|
Using 50% similarity for rename/copy detection. Override with --similarity.
|
|
</code></pre></div></div><p><div class="paragraph"></p></div>
|
|
</div>
|
|
<div class="sect3">
|
|
<h4 id="_manual_merge_example">Manual Merge Example</h4>
|
|
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Make sure we have the most up-to-date branch sources.
|
|
<span style="font-weight: bold; color: #ffffff">$ git fetch</span>
|
|
|
|
# Here's a commit (from some.committer) that we want to 'drover'.
|
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
|
<span style="color: #e7e71c">commit 441c947b3ff6e1d6b9036d67926011fbea92724f</span>
|
|
Author: some.committer <some.committer@chromium.org>
|
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
|
Commit: some.committer <some.committer@chromium.org>
|
|
CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
|
|
This change needs to go to branch 9999
|
|
|
|
# Checkout the branch we want to 'drover' to.
|
|
<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
|
|
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
|
|
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 441c947b3ff6e1d6b9036d67926011fbea92724f</span>
|
|
[drover_9999 c7b0d40] 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(+)
|
|
create mode 100644 modified_file
|
|
|
|
# That took the code authored by some.committer and committed it to
|
|
# the branch by the person who drovered it (i.e. you).
|
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
|
<span style="color: #e7e71c">commit c7b0d40c9f5793a27043688183a48597e656adcc</span>
|
|
Author: some.committer <some.committer@chromium.org>
|
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
|
Commit: you <you@chromium.org>
|
|
CommitDate: Thu Apr 10 09:11:36 2014 +0000
|
|
|
|
This change needs to go to branch 9999
|
|
|
|
(cherry picked from commit 441c947b3ff6e1d6b9036d67926011fbea92724f)
|
|
|
|
# Looks good. Ship it!
|
|
<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
|
|
# Wait for LGTM or TBR it.
|
|
<span style="font-weight: bold; color: #ffffff">$ git cl land</span>
|
|
Using 50% similarity for rename/copy detection. Override with --similarity.
|
|
# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
|
|
</code></pre></div></div><p><div class="paragraph"></p></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_see_also">SEE ALSO</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>, <a href="git-revert.html">git-revert(1)</a></p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
|
assist with the development of chromium and related projects. Download the tools
|
|
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div id="footnotes"><hr /></div>
|
|
<div id="footer">
|
|
<div id="footer-text">
|
|
Last updated 2016-12-15 15:36:52 PST
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|