| Index: docs/html/git-rebase-update.html
|
| diff --git a/docs/html/git-rebase-update.html b/docs/html/git-rebase-update.html
|
| deleted file mode 100644
|
| index 9cae8a920d546f504b794726673f65d59b1ed5a4..0000000000000000000000000000000000000000
|
| --- a/docs/html/git-rebase-update.html
|
| +++ /dev/null
|
| @@ -1,937 +0,0 @@
|
| -<!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-rebase-update(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-rebase-update(1) Manual Page
|
| -</h1>
|
| -<h2>NAME</h2>
|
| -<div class="sectionbody">
|
| -<p>git-rebase-update -
|
| - Updates all branches to have the latest changes from their upstreams.
|
| -</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 rebase-update</em> [-v | --verbose] [-n | --no_fetch]</pre>
|
| -<div class="attribution">
|
| -</div></div>
|
| -</div>
|
| -</div>
|
| -<div class="sect1">
|
| -<h2 id="_description">DESCRIPTION</h2>
|
| -<div class="sectionbody">
|
| -<div class="paragraph"><p>Brings all branches up-to-date with their tracking branches. This involves
|
| -several phases:</p></div>
|
| -<div class="dlist"><dl>
|
| -<dt class="hdlist1">
|
| -Preparation
|
| -</dt>
|
| -<dd>
|
| -<p>
|
| - If you currently have a branch checked out, any changes on that branch are
|
| - <em>frozen</em> (See <a href="git-freeze.html">git-freeze(1)</a> for more detail). Additionally, the current
|
| - branch is recorded for the <em>Restoration</em> phase later (see <em>CONFIGURATION
|
| - VARIABLES</em> for details on <code>depot-tools.rebase-update.starting-branch</code>).
|
| -</p>
|
| -</dd>
|
| -<dt class="hdlist1">
|
| -Fetching
|
| -</dt>
|
| -<dd>
|
| -<p>
|
| - All branches are examined to find their upstream references. The correct set
|
| - of git remotes is determined, and fetched accordingly. Note that if any
|
| - branches have a tag as their upstream, we are forced to pull all remotes.
|
| -</p>
|
| -<div class="paragraph"><p>Pass <code>--no_fetch</code> to skip this phase.</p></div>
|
| -</dd>
|
| -<dt class="hdlist1">
|
| -Rebasing
|
| -</dt>
|
| -<dd>
|
| -<p>
|
| - All branches are rebased in topological order from roots (upstreams) to
|
| - leaves. Each branch is rebased from its marked merge-base (see <em>CONFIGURATION
|
| - VARIABLES</em>) to the branch tip on top of its parent branch. If the parent
|
| - branch is <em>frozen</em> (see <a href="git-freeze.html">git-freeze(1)</a>), the branch will be rebased
|
| - onto the last non-freeze commit on the parent branch.
|
| -</p>
|
| -<div class="paragraph"><p>Things get interesting when there are merge conflicts on rebase. The <strong>most
|
| -common</strong> cause for conflicts is when your branch has been committed to the
|
| -upstream in squashed form, ala <a href="git-squash-branch.html">git-squash-branch(1)</a>, which is what
|
| -<a href="git-cl.html">git-cl(1)</a> and the <em>Commit Queue</em> will do. Because of that, <code>git
|
| -rebase-update</code> will attempt to squash your conflicted branch to see if the
|
| -squashed version applies cleanly to its upstream.</p></div>
|
| -<div class="paragraph"><p>If it does not apply cleanly, then your original (non-squashed) branch will be
|
| -left in mid-rebase and <code>git rebase-update</code> will exit. You can deal with this
|
| -like any other conflicted rebase. When you’re done, just <code>git rebase-update</code>
|
| -again to pick up where you left off.</p></div>
|
| -</dd>
|
| -<dt class="hdlist1">
|
| -Cleanup
|
| -</dt>
|
| -<dd>
|
| -<p>
|
| - Once all the branches have been rebased, any empty branches (i.e. branches
|
| - with no commits on them) are removed. If a branch is removed in this fashion,
|
| - any branches which depend on it are reparented to the parent of the removed
|
| - branch (see <a href="git-reparent-branch.html">git-reparent-branch(1)</a>).
|
| -</p>
|
| -</dd>
|
| -<dt class="hdlist1">
|
| -Restoration
|
| -</dt>
|
| -<dd>
|
| -<p>
|
| - <code>git rebase-update</code> checks out the branch that you started on, and <em>thaws</em> it,
|
| - if necessary (see <a href="git-thaw.html">git-thaw(1)</a>). If the branch you started on got
|
| - cleaned up, <code>git rebase-update</code> will checkout the <em>root</em> ref (defaults to
|
| - <em>origin/master</em>, as configured by <code>depot-tools.upstream</code>, see
|
| - <a href="git-new-branch.html">git-new-branch(1)</a>).
|
| -</p>
|
| -</dd>
|
| -</dl></div>
|
| -</div>
|
| -</div>
|
| -<div class="sect1">
|
| -<h2 id="_options">OPTIONS</h2>
|
| -<div class="sectionbody">
|
| -<div class="dlist"><dl>
|
| -<dt class="hdlist1">
|
| --n
|
| -</dt>
|
| -<dt class="hdlist1">
|
| ---no_fetch
|
| -</dt>
|
| -<dd>
|
| -<p>
|
| - Skip the <code>git fetch</code> phase of rebase-update.
|
| -</p>
|
| -</dd>
|
| -<dt class="hdlist1">
|
| --v
|
| -</dt>
|
| -<dt class="hdlist1">
|
| ---verbose
|
| -</dt>
|
| -<dd>
|
| -<p>
|
| - More text than your terminal can handle.
|
| -</p>
|
| -</dd>
|
| -</dl></div>
|
| -</div>
|
| -</div>
|
| -<div class="sect1">
|
| -<h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
|
| -<div class="sectionbody">
|
| -<div class="sect2">
|
| -<h3 id="_depot_tools_rebase_update_starting_branch">depot-tools.rebase-update.starting-branch</h3>
|
| -<div class="paragraph"><p>When <code>git rebase-update</code> first runs, it will record the current branch here so
|
| -that when it completes successfully, it will return back to the same branch you
|
| -started on, even if <code>git rebase-update</code> is interrupted due to rebase conflicts.
|
| -When <code>git rebase-update</code> completes successfully, this configuration variable is
|
| -removed.</p></div>
|
| -</div>
|
| -<div class="sect2">
|
| -<h3 id="_branch_lt_name_gt_dormant">branch.<name>.dormant</h3>
|
| -<div class="paragraph"><p>If <code>true</code>, will cause rebase-update to skip all processing on the branch.
|
| -Useful for old/high-conflict branches which you want to keep for posterity, but
|
| -don’t want to deal with when running <code>git rebase-update</code></p></div>
|
| -</div>
|
| -<div class="sect2">
|
| -<h3 id="_branch_lt_name_gt_base">branch.<name>.base</h3>
|
| -<div class="paragraph"><p>Holds the <em>base</em> reference for this branch. By default this is equivalent to
|
| -<code>git merge-base <name> <name>@{upstream}</code>. However, it can diverge if
|
| -<code><name>@{upstream}</code> is manually rebased. In this case, it correctly preserves
|
| -the value it had before, where <code>git merge-base</code> would now report the wrong
|
| -value.</p></div>
|
| -<div class="paragraph"><p>All of the tools in the <a href="depot_tools.html">depot_tools(1)</a> suite collude to keep this value
|
| -as up-to-date as possible, including <a href="git-reparent-branch.html">git-reparent-branch(1)</a>, and
|
| -<a href="git-new-branch.html">git-new-branch(1)</a>. <a href="git-map.html">git-map(1)</a> also shows the location of these
|
| -marker values in <strong><span class="black-background white">white</span></strong>.</p></div>
|
| -<div class="paragraph"><p><a href="git-mark-merge-base.html">git-mark-merge-base(1)</a> allows easy manual interaction for this value,
|
| -in the unlikely event that it gets out of sync.</p></div>
|
| -</div>
|
| -</div>
|
| -</div>
|
| -<div class="sect1">
|
| -<h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
|
| -<div class="sectionbody">
|
| -<div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
|
| -file.</p></div>
|
| -<div class="listingblock">
|
| -<div class="content">
|
| -<pre><code>[alias]
|
| - git reup = rebase-update</code></pre>
|
| -</div></div>
|
| -</div>
|
| -</div>
|
| -<div class="sect1">
|
| -<h2 id="_see_also">SEE ALSO</h2>
|
| -<div class="sectionbody">
|
| -<div class="paragraph"><p><a href="git-new-branch.html">git-new-branch(1)</a>, <a href="git-reparent-branch.html">git-reparent-branch(1)</a>,
|
| -<a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream-diff.html">git-upstream-diff(1)</a>,
|
| -<a href="git-freeze.html">git-freeze(1)</a>, <a href="git-mark-merge-base.html">git-mark-merge-base(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 2014-04-10 14:23:11 PDT
|
| -</div>
|
| -</div>
|
| -</body>
|
| -</html>
|
|
|
Chromium Code Reviews
Issue 259863004:
Move docs folder to man. (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master