| OLD | NEW |
|---|
| (Empty) |
| 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" | |
| 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
| 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> | |
| 4 <head> | |
| 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /
> | |
| 6 <meta name="generator" content="AsciiDoc 8.6.9" /> | |
| 7 <title>git-mark-merge-base(1)</title> | |
| 8 <style type="text/css"> | |
| 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ | |
| 10 | |
| 11 /* Default font. */ | |
| 12 body { | |
| 13 font-family: Georgia,serif; | |
| 14 } | |
| 15 | |
| 16 /* Title font. */ | |
| 17 h1, h2, h3, h4, h5, h6, | |
| 18 div.title, caption.title, | |
| 19 thead, p.table.header, | |
| 20 #toctitle, | |
| 21 #author, #revnumber, #revdate, #revremark, | |
| 22 #footer { | |
| 23 font-family: Arial,Helvetica,sans-serif; | |
| 24 } | |
| 25 | |
| 26 body { | |
| 27 margin: 1em 5% 1em 5%; | |
| 28 } | |
| 29 | |
| 30 a { | |
| 31 color: blue; | |
| 32 text-decoration: underline; | |
| 33 } | |
| 34 a:visited { | |
| 35 color: fuchsia; | |
| 36 } | |
| 37 | |
| 38 em { | |
| 39 font-style: italic; | |
| 40 color: navy; | |
| 41 } | |
| 42 | |
| 43 strong { | |
| 44 font-weight: bold; | |
| 45 color: #083194; | |
| 46 } | |
| 47 | |
| 48 h1, h2, h3, h4, h5, h6 { | |
| 49 color: #527bbd; | |
| 50 margin-top: 1.2em; | |
| 51 margin-bottom: 0.5em; | |
| 52 line-height: 1.3; | |
| 53 } | |
| 54 | |
| 55 h1, h2, h3 { | |
| 56 border-bottom: 2px solid silver; | |
| 57 } | |
| 58 h2 { | |
| 59 padding-top: 0.5em; | |
| 60 } | |
| 61 h3 { | |
| 62 float: left; | |
| 63 } | |
| 64 h3 + * { | |
| 65 clear: left; | |
| 66 } | |
| 67 h5 { | |
| 68 font-size: 1.0em; | |
| 69 } | |
| 70 | |
| 71 div.sectionbody { | |
| 72 margin-left: 0; | |
| 73 } | |
| 74 | |
| 75 hr { | |
| 76 border: 1px solid silver; | |
| 77 } | |
| 78 | |
| 79 p { | |
| 80 margin-top: 0.5em; | |
| 81 margin-bottom: 0.5em; | |
| 82 } | |
| 83 | |
| 84 ul, ol, li > p { | |
| 85 margin-top: 0; | |
| 86 } | |
| 87 ul > li { color: #aaa; } | |
| 88 ul > li > * { color: black; } | |
| 89 | |
| 90 .monospaced, code, pre { | |
| 91 font-family: "Courier New", Courier, monospace; | |
| 92 font-size: inherit; | |
| 93 color: navy; | |
| 94 padding: 0; | |
| 95 margin: 0; | |
| 96 } | |
| 97 pre { | |
| 98 white-space: pre-wrap; | |
| 99 } | |
| 100 | |
| 101 #author { | |
| 102 color: #527bbd; | |
| 103 font-weight: bold; | |
| 104 font-size: 1.1em; | |
| 105 } | |
| 106 #email { | |
| 107 } | |
| 108 #revnumber, #revdate, #revremark { | |
| 109 } | |
| 110 | |
| 111 #footer { | |
| 112 font-size: small; | |
| 113 border-top: 2px solid silver; | |
| 114 padding-top: 0.5em; | |
| 115 margin-top: 4.0em; | |
| 116 } | |
| 117 #footer-text { | |
| 118 float: left; | |
| 119 padding-bottom: 0.5em; | |
| 120 } | |
| 121 #footer-badges { | |
| 122 float: right; | |
| 123 padding-bottom: 0.5em; | |
| 124 } | |
| 125 | |
| 126 #preamble { | |
| 127 margin-top: 1.5em; | |
| 128 margin-bottom: 1.5em; | |
| 129 } | |
| 130 div.imageblock, div.exampleblock, div.verseblock, | |
| 131 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, | |
| 132 div.admonitionblock { | |
| 133 margin-top: 1.0em; | |
| 134 margin-bottom: 1.5em; | |
| 135 } | |
| 136 div.admonitionblock { | |
| 137 margin-top: 2.0em; | |
| 138 margin-bottom: 2.0em; | |
| 139 margin-right: 10%; | |
| 140 color: #606060; | |
| 141 } | |
| 142 | |
| 143 div.content { /* Block element content. */ | |
| 144 padding: 0; | |
| 145 } | |
| 146 | |
| 147 /* Block element titles. */ | |
| 148 div.title, caption.title { | |
| 149 color: #527bbd; | |
| 150 font-weight: bold; | |
| 151 text-align: left; | |
| 152 margin-top: 1.0em; | |
| 153 margin-bottom: 0.5em; | |
| 154 } | |
| 155 div.title + * { | |
| 156 margin-top: 0; | |
| 157 } | |
| 158 | |
| 159 td div.title:first-child { | |
| 160 margin-top: 0.0em; | |
| 161 } | |
| 162 div.content div.title:first-child { | |
| 163 margin-top: 0.0em; | |
| 164 } | |
| 165 div.content + div.title { | |
| 166 margin-top: 0.0em; | |
| 167 } | |
| 168 | |
| 169 div.sidebarblock > div.content { | |
| 170 background: #ffffee; | |
| 171 border: 1px solid #dddddd; | |
| 172 border-left: 4px solid #f0f0f0; | |
| 173 padding: 0.5em; | |
| 174 } | |
| 175 | |
| 176 div.listingblock > div.content { | |
| 177 border: 1px solid #dddddd; | |
| 178 border-left: 5px solid #f0f0f0; | |
| 179 background: #f8f8f8; | |
| 180 padding: 0.5em; | |
| 181 } | |
| 182 | |
| 183 div.quoteblock, div.verseblock { | |
| 184 padding-left: 1.0em; | |
| 185 margin-left: 1.0em; | |
| 186 margin-right: 10%; | |
| 187 border-left: 5px solid #f0f0f0; | |
| 188 color: #888; | |
| 189 } | |
| 190 | |
| 191 div.quoteblock > div.attribution { | |
| 192 padding-top: 0.5em; | |
| 193 text-align: right; | |
| 194 } | |
| 195 | |
| 196 div.verseblock > pre.content { | |
| 197 font-family: inherit; | |
| 198 font-size: inherit; | |
| 199 } | |
| 200 div.verseblock > div.attribution { | |
| 201 padding-top: 0.75em; | |
| 202 text-align: left; | |
| 203 } | |
| 204 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */ | |
| 205 div.verseblock + div.attribution { | |
| 206 text-align: left; | |
| 207 } | |
| 208 | |
| 209 div.admonitionblock .icon { | |
| 210 vertical-align: top; | |
| 211 font-size: 1.1em; | |
| 212 font-weight: bold; | |
| 213 text-decoration: underline; | |
| 214 color: #527bbd; | |
| 215 padding-right: 0.5em; | |
| 216 } | |
| 217 div.admonitionblock td.content { | |
| 218 padding-left: 0.5em; | |
| 219 border-left: 3px solid #dddddd; | |
| 220 } | |
| 221 | |
| 222 div.exampleblock > div.content { | |
| 223 border-left: 3px solid #dddddd; | |
| 224 padding-left: 0.5em; | |
| 225 } | |
| 226 | |
| 227 div.imageblock div.content { padding-left: 0; } | |
| 228 span.image img { border-style: none; vertical-align: text-bottom; } | |
| 229 a.image:visited { color: white; } | |
| 230 | |
| 231 dl { | |
| 232 margin-top: 0.8em; | |
| 233 margin-bottom: 0.8em; | |
| 234 } | |
| 235 dt { | |
| 236 margin-top: 0.5em; | |
| 237 margin-bottom: 0; | |
| 238 font-style: normal; | |
| 239 color: navy; | |
| 240 } | |
| 241 dd > *:first-child { | |
| 242 margin-top: 0.1em; | |
| 243 } | |
| 244 | |
| 245 ul, ol { | |
| 246 list-style-position: outside; | |
| 247 } | |
| 248 ol.arabic { | |
| 249 list-style-type: decimal; | |
| 250 } | |
| 251 ol.loweralpha { | |
| 252 list-style-type: lower-alpha; | |
| 253 } | |
| 254 ol.upperalpha { | |
| 255 list-style-type: upper-alpha; | |
| 256 } | |
| 257 ol.lowerroman { | |
| 258 list-style-type: lower-roman; | |
| 259 } | |
| 260 ol.upperroman { | |
| 261 list-style-type: upper-roman; | |
| 262 } | |
| 263 | |
| 264 div.compact ul, div.compact ol, | |
| 265 div.compact p, div.compact p, | |
| 266 div.compact div, div.compact div { | |
| 267 margin-top: 0.1em; | |
| 268 margin-bottom: 0.1em; | |
| 269 } | |
| 270 | |
| 271 tfoot { | |
| 272 font-weight: bold; | |
| 273 } | |
| 274 td > div.verse { | |
| 275 white-space: pre; | |
| 276 } | |
| 277 | |
| 278 div.hdlist { | |
| 279 margin-top: 0.8em; | |
| 280 margin-bottom: 0.8em; | |
| 281 } | |
| 282 div.hdlist tr { | |
| 283 padding-bottom: 15px; | |
| 284 } | |
| 285 dt.hdlist1.strong, td.hdlist1.strong { | |
| 286 font-weight: bold; | |
| 287 } | |
| 288 td.hdlist1 { | |
| 289 vertical-align: top; | |
| 290 font-style: normal; | |
| 291 padding-right: 0.8em; | |
| 292 color: navy; | |
| 293 } | |
| 294 td.hdlist2 { | |
| 295 vertical-align: top; | |
| 296 } | |
| 297 div.hdlist.compact tr { | |
| 298 margin: 0; | |
| 299 padding-bottom: 0; | |
| 300 } | |
| 301 | |
| 302 .comment { | |
| 303 background: yellow; | |
| 304 } | |
| 305 | |
| 306 .footnote, .footnoteref { | |
| 307 font-size: 0.8em; | |
| 308 } | |
| 309 | |
| 310 span.footnote, span.footnoteref { | |
| 311 vertical-align: super; | |
| 312 } | |
| 313 | |
| 314 #footnotes { | |
| 315 margin: 20px 0 20px 0; | |
| 316 padding: 7px 0 0 0; | |
| 317 } | |
| 318 | |
| 319 #footnotes div.footnote { | |
| 320 margin: 0 0 5px 0; | |
| 321 } | |
| 322 | |
| 323 #footnotes hr { | |
| 324 border: none; | |
| 325 border-top: 1px solid silver; | |
| 326 height: 1px; | |
| 327 text-align: left; | |
| 328 margin-left: 0; | |
| 329 width: 20%; | |
| 330 min-width: 100px; | |
| 331 } | |
| 332 | |
| 333 div.colist td { | |
| 334 padding-right: 0.5em; | |
| 335 padding-bottom: 0.3em; | |
| 336 vertical-align: top; | |
| 337 } | |
| 338 div.colist td img { | |
| 339 margin-top: 0.3em; | |
| 340 } | |
| 341 | |
| 342 @media print { | |
| 343 #footer-badges { display: none; } | |
| 344 } | |
| 345 | |
| 346 #toc { | |
| 347 margin-bottom: 2.5em; | |
| 348 } | |
| 349 | |
| 350 #toctitle { | |
| 351 color: #527bbd; | |
| 352 font-size: 1.1em; | |
| 353 font-weight: bold; | |
| 354 margin-top: 1.0em; | |
| 355 margin-bottom: 0.1em; | |
| 356 } | |
| 357 | |
| 358 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { | |
| 359 margin-top: 0; | |
| 360 margin-bottom: 0; | |
| 361 } | |
| 362 div.toclevel2 { | |
| 363 margin-left: 2em; | |
| 364 font-size: 0.9em; | |
| 365 } | |
| 366 div.toclevel3 { | |
| 367 margin-left: 4em; | |
| 368 font-size: 0.9em; | |
| 369 } | |
| 370 div.toclevel4 { | |
| 371 margin-left: 6em; | |
| 372 font-size: 0.9em; | |
| 373 } | |
| 374 | |
| 375 span.aqua { color: aqua; } | |
| 376 span.black { color: black; } | |
| 377 span.blue { color: blue; } | |
| 378 span.fuchsia { color: fuchsia; } | |
| 379 span.gray { color: gray; } | |
| 380 span.green { color: green; } | |
| 381 span.lime { color: lime; } | |
| 382 span.maroon { color: maroon; } | |
| 383 span.navy { color: navy; } | |
| 384 span.olive { color: olive; } | |
| 385 span.purple { color: purple; } | |
| 386 span.red { color: red; } | |
| 387 span.silver { color: silver; } | |
| 388 span.teal { color: teal; } | |
| 389 span.white { color: white; } | |
| 390 span.yellow { color: yellow; } | |
| 391 | |
| 392 span.aqua-background { background: aqua; } | |
| 393 span.black-background { background: black; } | |
| 394 span.blue-background { background: blue; } | |
| 395 span.fuchsia-background { background: fuchsia; } | |
| 396 span.gray-background { background: gray; } | |
| 397 span.green-background { background: green; } | |
| 398 span.lime-background { background: lime; } | |
| 399 span.maroon-background { background: maroon; } | |
| 400 span.navy-background { background: navy; } | |
| 401 span.olive-background { background: olive; } | |
| 402 span.purple-background { background: purple; } | |
| 403 span.red-background { background: red; } | |
| 404 span.silver-background { background: silver; } | |
| 405 span.teal-background { background: teal; } | |
| 406 span.white-background { background: white; } | |
| 407 span.yellow-background { background: yellow; } | |
| 408 | |
| 409 span.big { font-size: 2em; } | |
| 410 span.small { font-size: 0.6em; } | |
| 411 | |
| 412 span.underline { text-decoration: underline; } | |
| 413 span.overline { text-decoration: overline; } | |
| 414 span.line-through { text-decoration: line-through; } | |
| 415 | |
| 416 div.unbreakable { page-break-inside: avoid; } | |
| 417 | |
| 418 | |
| 419 /* | |
| 420 * xhtml11 specific | |
| 421 * | |
| 422 * */ | |
| 423 | |
| 424 div.tableblock { | |
| 425 margin-top: 1.0em; | |
| 426 margin-bottom: 1.5em; | |
| 427 } | |
| 428 div.tableblock > table { | |
| 429 border: 3px solid #527bbd; | |
| 430 } | |
| 431 thead, p.table.header { | |
| 432 font-weight: bold; | |
| 433 color: #527bbd; | |
| 434 } | |
| 435 p.table { | |
| 436 margin-top: 0; | |
| 437 } | |
| 438 /* Because the table frame attribute is overriden by CSS in most browsers. */ | |
| 439 div.tableblock > table[frame="void"] { | |
| 440 border-style: none; | |
| 441 } | |
| 442 div.tableblock > table[frame="hsides"] { | |
| 443 border-left-style: none; | |
| 444 border-right-style: none; | |
| 445 } | |
| 446 div.tableblock > table[frame="vsides"] { | |
| 447 border-top-style: none; | |
| 448 border-bottom-style: none; | |
| 449 } | |
| 450 | |
| 451 | |
| 452 /* | |
| 453 * html5 specific | |
| 454 * | |
| 455 * */ | |
| 456 | |
| 457 table.tableblock { | |
| 458 margin-top: 1.0em; | |
| 459 margin-bottom: 1.5em; | |
| 460 } | |
| 461 thead, p.tableblock.header { | |
| 462 font-weight: bold; | |
| 463 color: #527bbd; | |
| 464 } | |
| 465 p.tableblock { | |
| 466 margin-top: 0; | |
| 467 } | |
| 468 table.tableblock { | |
| 469 border-width: 3px; | |
| 470 border-spacing: 0px; | |
| 471 border-style: solid; | |
| 472 border-color: #527bbd; | |
| 473 border-collapse: collapse; | |
| 474 } | |
| 475 th.tableblock, td.tableblock { | |
| 476 border-width: 1px; | |
| 477 padding: 4px; | |
| 478 border-style: solid; | |
| 479 border-color: #527bbd; | |
| 480 } | |
| 481 | |
| 482 table.tableblock.frame-topbot { | |
| 483 border-left-style: hidden; | |
| 484 border-right-style: hidden; | |
| 485 } | |
| 486 table.tableblock.frame-sides { | |
| 487 border-top-style: hidden; | |
| 488 border-bottom-style: hidden; | |
| 489 } | |
| 490 table.tableblock.frame-none { | |
| 491 border-style: hidden; | |
| 492 } | |
| 493 | |
| 494 th.tableblock.halign-left, td.tableblock.halign-left { | |
| 495 text-align: left; | |
| 496 } | |
| 497 th.tableblock.halign-center, td.tableblock.halign-center { | |
| 498 text-align: center; | |
| 499 } | |
| 500 th.tableblock.halign-right, td.tableblock.halign-right { | |
| 501 text-align: right; | |
| 502 } | |
| 503 | |
| 504 th.tableblock.valign-top, td.tableblock.valign-top { | |
| 505 vertical-align: top; | |
| 506 } | |
| 507 th.tableblock.valign-middle, td.tableblock.valign-middle { | |
| 508 vertical-align: middle; | |
| 509 } | |
| 510 th.tableblock.valign-bottom, td.tableblock.valign-bottom { | |
| 511 vertical-align: bottom; | |
| 512 } | |
| 513 | |
| 514 | |
| 515 /* | |
| 516 * manpage specific | |
| 517 * | |
| 518 * */ | |
| 519 | |
| 520 body.manpage h1 { | |
| 521 padding-top: 0.5em; | |
| 522 padding-bottom: 0.5em; | |
| 523 border-top: 2px solid silver; | |
| 524 border-bottom: 2px solid silver; | |
| 525 } | |
| 526 body.manpage h2 { | |
| 527 border-style: none; | |
| 528 } | |
| 529 body.manpage div.sectionbody { | |
| 530 margin-left: 3em; | |
| 531 } | |
| 532 | |
| 533 @media print { | |
| 534 body.manpage div#toc { display: none; } | |
| 535 } | |
| 536 | |
| 537 | |
| 538 div.listingblock > div.content { | |
| 539 background: rgb(28, 28, 28); | |
| 540 } | |
| 541 | |
| 542 div.listingblock > div > pre > code { | |
| 543 color: rgb(187, 187, 187); | |
| 544 } | |
| 545 </style> | |
| 546 <script type="text/javascript"> | |
| 547 /*<+'])'); | |
| 590 // Function that scans the DOM tree for header elements (the DOM2 | |
| 591 // nodeIterator API would be a better technique but not supported by all | |
| 592 // browsers). | |
| 593 var iterate = function (el) { | |
| 594 for (var i = el.firstChild; i != null; i = i.nextSibling) { | |
| 595 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) { | |
| 596 var mo = re.exec(i.tagName); | |
| 597 if (mo && (i.getAttribute("class") || i.getAttribute("className")) !=
"float") { | |
| 598 result[result.length] = new TocEntry(i, getText(i), mo[1]-1); | |
| 599 } | |
| 600 iterate(i); | |
| 601 } | |
| 602 } | |
| 603 } | |
| 604 iterate(el); | |
| 605 return result; | |
| 606 } | |
| 607 | |
| 608 var toc = document.getElementById("toc"); | |
| 609 if (!toc) { | |
| 610 return; | |
| 611 } | |
| 612 | |
| 613 // Delete existing TOC entries in case we're reloading the TOC. | |
| 614 var tocEntriesToRemove = []; | |
| 615 var i; | |
| 616 for (i = 0; i < toc.childNodes.length; i++) { | |
| 617 var entry = toc.childNodes[i]; | |
| 618 if (entry.nodeName.toLowerCase() == 'div' | |
| 619 && entry.getAttribute("class") | |
| 620 && entry.getAttribute("class").match(/^toclevel/)) | |
| 621 tocEntriesToRemove.push(entry); | |
| 622 } | |
| 623 for (i = 0; i < tocEntriesToRemove.length; i++) { | |
| 624 toc.removeChild(tocEntriesToRemove[i]); | |
| 625 } | |
| 626 | |
| 627 // Rebuild TOC entries. | |
| 628 var entries = tocEntries(document.getElementById("content"), toclevels); | |
| 629 for (var i = 0; i < entries.length; ++i) { | |
| 630 var entry = entries[i]; | |
| 631 if (entry.element.id == "") | |
| 632 entry.element.id = "_toc_" + i; | |
| 633 var a = document.createElement("a"); | |
| 634 a.href = "#" + entry.element.id; | |
| 635 a.appendChild(document.createTextNode(entry.text)); | |
| 636 var div = document.createElement("div"); | |
| 637 div.appendChild(a); | |
| 638 div.className = "toclevel" + entry.toclevel; | |
| 639 toc.appendChild(div); | |
| 640 } | |
| 641 if (entries.length == 0) | |
| 642 toc.parentNode.removeChild(toc); | |
| 643 }, | |
| 644 | |
| 645 | |
| 646 ///////////////////////////////////////////////////////////////////// | |
| 647 // Footnotes generator | |
| 648 ///////////////////////////////////////////////////////////////////// | |
| 649 | |
| 650 /* Based on footnote generation code from: | |
| 651 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html | |
| 652 */ | |
| 653 | |
| 654 footnotes: function () { | |
| 655 // Delete existing footnote entries in case we're reloading the footnodes. | |
| 656 var i; | |
| 657 var noteholder = document.getElementById("footnotes"); | |
| 658 if (!noteholder) { | |
| 659 return; | |
| 660 } | |
| 661 var entriesToRemove = []; | |
| 662 for (i = 0; i < noteholder.childNodes.length; i++) { | |
| 663 var entry = noteholder.childNodes[i]; | |
| 664 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") ==
"footnote") | |
| 665 entriesToRemove.push(entry); | |
| 666 } | |
| 667 for (i = 0; i < entriesToRemove.length; i++) { | |
| 668 noteholder.removeChild(entriesToRemove[i]); | |
| 669 } | |
| 670 | |
| 671 // Rebuild footnote entries. | |
| 672 var cont = document.getElementById("content"); | |
| 673 var spans = cont.getElementsByTagName("span"); | |
| 674 var refs = {}; | |
| 675 var n = 0; | |
| 676 for (i=0; i<spans.length; i++) { | |
| 677 if (spans[i].className == "footnote") { | |
| 678 n++; | |
| 679 var note = spans[i].getAttribute("data-note"); | |
| 680 if (!note) { | |
| 681 // Use [\s\S] in place of . so multi-line matches work. | |
| 682 // Because JavaScript has no s (dotall) regex flag. | |
| 683 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1]; | |
| 684 spans[i].innerHTML = | |
| 685 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n + | |
| 686 "' title='View footnote' class='footnote'>" + n + "</a>]"; | |
| 687 spans[i].setAttribute("data-note", note); | |
| 688 } | |
| 689 noteholder.innerHTML += | |
| 690 "<div class='footnote' id='_footnote_" + n + "'>" + | |
| 691 "<a href='#_footnoteref_" + n + "' title='Return to text'>" + | |
| 692 n + "</a>. " + note + "</div>"; | |
| 693 var id =spans[i].getAttribute("id"); | |
| 694 if (id != null) refs["#"+id] = n; | |
| 695 } | |
| 696 } | |
| 697 if (n == 0) | |
| 698 noteholder.parentNode.removeChild(noteholder); | |
| 699 else { | |
| 700 // Process footnoterefs. | |
| 701 for (i=0; i<spans.length; i++) { | |
| 702 if (spans[i].className == "footnoteref") { | |
| 703 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href"); | |
| 704 href = href.match(/#.*/)[0]; // Because IE return full URL. | |
| 705 n = refs[href]; | |
| 706 spans[i].innerHTML = | |
| 707 "[<a href='#_footnote_" + n + | |
| 708 "' title='View footnote' class='footnote'>" + n + "</a>]"; | |
| 709 } | |
| 710 } | |
| 711 } | |
| 712 }, | |
| 713 | |
| 714 install: function(toclevels) { | |
| 715 var timerId; | |
| 716 | |
| 717 function reinstall() { | |
| 718 asciidoc.footnotes(); | |
| 719 if (toclevels) { | |
| 720 asciidoc.toc(toclevels); | |
| 721 } | |
| 722 } | |
| 723 | |
| 724 function reinstallAndRemoveTimer() { | |
| 725 clearInterval(timerId); | |
| 726 reinstall(); | |
| 727 } | |
| 728 | |
| 729 timerId = setInterval(reinstall, 500); | |
| 730 if (document.addEventListener) | |
| 731 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false
); | |
| 732 else | |
| 733 window.onload = reinstallAndRemoveTimer; | |
| 734 } | |
| 735 | |
| 736 } | |
| 737 asciidoc.install(); | |
| 738 /*]]>*/ | |
| 739 </script> | |
| 740 </head> | |
| 741 <body class="manpage"> | |
| 742 <div id="header"> | |
| 743 <h1> | |
| 744 git-mark-merge-base(1) Manual Page | |
| 745 </h1> | |
| 746 <h2>NAME</h2> | |
| 747 <div class="sectionbody"> | |
| 748 <p>git-mark-merge-base - | |
| 749 Manually interact with depot_tools' merge-base markers. | |
| 750 </p> | |
| 751 </div> | |
| 752 </div> | |
| 753 <div id="content"> | |
| 754 <div class="sect1"> | |
| 755 <h2 id="_synopsis">SYNOPSIS</h2> | |
| 756 <div class="sectionbody"> | |
| 757 <div class="verseblock"> | |
| 758 <pre class="content"><em>git mark-merge-base</em> | |
| 759 <em>git mark-merge-base</em> <commit hash> | |
| 760 <em>git mark-merge-base</em> [-d | --delete]</pre> | |
| 761 <div class="attribution"> | |
| 762 </div></div> | |
| 763 </div> | |
| 764 </div> | |
| 765 <div class="sect1"> | |
| 766 <h2 id="_description">DESCRIPTION</h2> | |
| 767 <div class="sectionbody"> | |
| 768 <div class="paragraph"><p>Inspect, set or delete the current merge-base marker f
or the current branch. | |
| 769 This should not be needed, but is useful if things get into a snarled state. | |
| 770 Pass no arguments to view the current value. If you provide <commit hash>,
then | |
| 771 <code>git mark-merge-base</code> will attempt to set that as the merge-base valu
e.</p></div> | |
| 772 <div class="paragraph"><p>It is invalid to pick a commit which is not an ancesto
r of the current branch.</p></div> | |
| 773 <div class="paragraph"><p>See <a href="git-rebase-update.html">git-rebase-update
(1)</a>'s description of the <code>branch.<name>.base</code> | |
| 774 configuration variable for more info on what the merge base markers are for.</p>
</div> | |
| 775 </div> | |
| 776 </div> | |
| 777 <div class="sect1"> | |
| 778 <h2 id="_options">OPTIONS</h2> | |
| 779 <div class="sectionbody"> | |
| 780 <div class="dlist"><dl> | |
| 781 <dt class="hdlist1"> | |
| 782 -d | |
| 783 </dt> | |
| 784 <dt class="hdlist1"> | |
| 785 --delete | |
| 786 </dt> | |
| 787 <dd> | |
| 788 <p> | |
| 789 Delete the merge-base marker for the current branch. | |
| 790 </p> | |
| 791 </dd> | |
| 792 <dt class="hdlist1"> | |
| 793 <commit hash> | |
| 794 </dt> | |
| 795 <dd> | |
| 796 <p> | |
| 797 The new value to set for the current branch’s merge-base marker. | |
| 798 </p> | |
| 799 </dd> | |
| 800 </dl></div> | |
| 801 </div> | |
| 802 </div> | |
| 803 <div class="sect1"> | |
| 804 <h2 id="_see_also">SEE ALSO</h2> | |
| 805 <div class="sectionbody"> | |
| 806 <div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)<
/a>, <a href="git-reparent-branch.html">git-reparent-branch(1)</a>, | |
| 807 <a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream
-diff.html">git-upstream-diff(1)</a></p></div> | |
| 808 </div> | |
| 809 </div> | |
| 810 <div class="sect1"> | |
| 811 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> | |
| 812 <div class="sectionbody"> | |
| 813 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_
tools(7)</a> suite. These tools are meant to | |
| 814 assist with the development of chromium and related projects. Download the tools | |
| 815 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
here</a>.</p></div> | |
| 816 </div> | |
| 817 </div> | |
| 818 </div> | |
| 819 <div id="footnotes"><hr /></div> | |
| 820 <div id="footer"> | |
| 821 <div id="footer-text"> | |
| 822 Last updated 2014-04-10 14:23:11 PDT | |
| 823 </div> | |
| 824 </div> | |
| 825 </body> | |
| 826 </html> | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 259863004:
Move docs folder to man. (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master