howto/revert-branch-rebase.html

   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="text/html; charset=UTF-8" />
   6 <meta name="generator" content="AsciiDoc 8.5.2" />
   7 <title>Reverting an existing commit</title>
   8 <style type="text/css">
   9 /* Debug borders */
  10 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
  11 /*
  12   border: 1px solid red;
  13 */
  14 }
  15
  16 body {
  17   margin: 1em 5% 1em 5%;
  18 }
  19
  20 a {
  21   color: blue;
  22   text-decoration: underline;
  23 }
  24 a:visited {
  25   color: fuchsia;
  26 }
  27
  28 em {
  29   font-style: italic;
  30   color: navy;
  31 }
  32
  33 strong {
  34   font-weight: bold;
  35   color: #083194;
  36 }
  37
  38 tt {
  39   color: navy;
  40 }
  41
  42 h1, h2, h3, h4, h5, h6 {
  43   color: #527bbd;
  44   font-family: sans-serif;
  45   margin-top: 1.2em;
  46   margin-bottom: 0.5em;
  47   line-height: 1.3;
  48 }
  49
  50 h1, h2, h3 {
  51   border-bottom: 2px solid silver;
  52 }
  53 h2 {
  54   padding-top: 0.5em;
  55 }
  56 h3 {
  57   float: left;
  58 }
  59 h3 + * {
  60   clear: left;
  61 }
  62
  63 div.sectionbody {
  64   font-family: serif;
  65   margin-left: 0;
  66 }
  67
  68 hr {
  69   border: 1px solid silver;
  70 }
  71
  72 p {
  73   margin-top: 0.5em;
  74   margin-bottom: 0.5em;
  75 }
  76
  77 ul, ol, li > p {
  78   margin-top: 0;
  79 }
  80
  81 pre {
  82   padding: 0;
  83   margin: 0;
  84 }
  85
  86 span#author {
  87   color: #527bbd;
  88   font-family: sans-serif;
  89   font-weight: bold;
  90   font-size: 1.1em;
  91 }
  92 span#email {
  93 }
  94 span#revnumber, span#revdate, span#revremark {
  95   font-family: sans-serif;
  96 }
  97
  98 div#footer {
  99   font-family: sans-serif;
 100   font-size: small;
 101   border-top: 2px solid silver;
 102   padding-top: 0.5em;
 103   margin-top: 4.0em;
 104 }
 105 div#footer-text {
 106   float: left;
 107   padding-bottom: 0.5em;
 108 }
 109 div#footer-badges {
 110   float: right;
 111   padding-bottom: 0.5em;
 112 }
 113
 114 div#preamble {
 115   margin-top: 1.5em;
 116   margin-bottom: 1.5em;
 117 }
 118 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
 119 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 120 div.admonitionblock {
 121   margin-top: 1.0em;
 122   margin-bottom: 1.5em;
 123 }
 124 div.admonitionblock {
 125   margin-top: 2.0em;
 126   margin-bottom: 2.0em;
 127   margin-right: 10%;
 128   color: #606060;
 129 }
 130
 131 div.content { /* Block element content. */
 132   padding: 0;
 133 }
 134
 135 /* Block element titles. */
 136 div.title, caption.title {
 137   color: #527bbd;
 138   font-family: sans-serif;
 139   font-weight: bold;
 140   text-align: left;
 141   margin-top: 1.0em;
 142   margin-bottom: 0.5em;
 143 }
 144 div.title + * {
 145   margin-top: 0;
 146 }
 147
 148 td div.title:first-child {
 149   margin-top: 0.0em;
 150 }
 151 div.content div.title:first-child {
 152   margin-top: 0.0em;
 153 }
 154 div.content + div.title {
 155   margin-top: 0.0em;
 156 }
 157
 158 div.sidebarblock > div.content {
 159   background: #ffffee;
 160   border: 1px solid silver;
 161   padding: 0.5em;
 162 }
 163
 164 div.listingblock > div.content {
 165   border: 1px solid silver;
 166   background: #f4f4f4;
 167   padding: 0.5em;
 168 }
 169
 170 div.quoteblock, div.verseblock {
 171   padding-left: 1.0em;
 172   margin-left: 1.0em;
 173   margin-right: 10%;
 174   border-left: 5px solid #dddddd;
 175   color: #777777;
 176 }
 177
 178 div.quoteblock > div.attribution {
 179   padding-top: 0.5em;
 180   text-align: right;
 181 }
 182
 183 div.verseblock > div.content {
 184   white-space: pre;
 185 }
 186 div.verseblock > div.attribution {
 187   padding-top: 0.75em;
 188   text-align: left;
 189 }
 190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 191 div.verseblock + div.attribution {
 192   text-align: left;
 193 }
 194
 195 div.admonitionblock .icon {
 196   vertical-align: top;
 197   font-size: 1.1em;
 198   font-weight: bold;
 199   text-decoration: underline;
 200   color: #527bbd;
 201   padding-right: 0.5em;
 202 }
 203 div.admonitionblock td.content {
 204   padding-left: 0.5em;
 205   border-left: 3px solid #dddddd;
 206 }
 207
 208 div.exampleblock > div.content {
 209   border-left: 3px solid #dddddd;
 210   padding-left: 0.5em;
 211 }
 212
 213 div.imageblock div.content { padding-left: 0; }
 214 span.image img { border-style: none; }
 215 a.image:visited { color: white; }
 216
 217 dl {
 218   margin-top: 0.8em;
 219   margin-bottom: 0.8em;
 220 }
 221 dt {
 222   margin-top: 0.5em;
 223   margin-bottom: 0;
 224   font-style: normal;
 225   color: navy;
 226 }
 227 dd > *:first-child {
 228   margin-top: 0.1em;
 229 }
 230
 231 ul, ol {
 232     list-style-position: outside;
 233 }
 234 ol.arabic {
 235   list-style-type: decimal;
 236 }
 237 ol.loweralpha {
 238   list-style-type: lower-alpha;
 239 }
 240 ol.upperalpha {
 241   list-style-type: upper-alpha;
 242 }
 243 ol.lowerroman {
 244   list-style-type: lower-roman;
 245 }
 246 ol.upperroman {
 247   list-style-type: upper-roman;
 248 }
 249
 250 div.compact ul, div.compact ol,
 251 div.compact p, div.compact p,
 252 div.compact div, div.compact div {
 253   margin-top: 0.1em;
 254   margin-bottom: 0.1em;
 255 }
 256
 257 div.tableblock > table {
 258   border: 3px solid #527bbd;
 259 }
 260 thead, p.table.header {
 261   font-family: sans-serif;
 262   font-weight: bold;
 263 }
 264 tfoot {
 265   font-weight: bold;
 266 }
 267 td > div.verse {
 268   white-space: pre;
 269 }
 270 p.table {
 271   margin-top: 0;
 272 }
 273 /* Because the table frame attribute is overriden by CSS in most browsers. */
 274 div.tableblock > table[frame="void"] {
 275   border-style: none;
 276 }
 277 div.tableblock > table[frame="hsides"] {
 278   border-left-style: none;
 279   border-right-style: none;
 280 }
 281 div.tableblock > table[frame="vsides"] {
 282   border-top-style: none;
 283   border-bottom-style: none;
 284 }
 285
 286
 287 div.hdlist {
 288   margin-top: 0.8em;
 289   margin-bottom: 0.8em;
 290 }
 291 div.hdlist tr {
 292   padding-bottom: 15px;
 293 }
 294 dt.hdlist1.strong, td.hdlist1.strong {
 295   font-weight: bold;
 296 }
 297 td.hdlist1 {
 298   vertical-align: top;
 299   font-style: normal;
 300   padding-right: 0.8em;
 301   color: navy;
 302 }
 303 td.hdlist2 {
 304   vertical-align: top;
 305 }
 306 div.hdlist.compact tr {
 307   margin: 0;
 308   padding-bottom: 0;
 309 }
 310
 311 .comment {
 312   background: yellow;
 313 }
 314
 315 .footnote, .footnoteref {
 316   font-size: 0.8em;
 317 }
 318
 319 span.footnote, span.footnoteref {
 320   vertical-align: super;
 321 }
 322
 323 #footnotes {
 324   margin: 20px 0 20px 0;
 325   padding: 7px 0 0 0;
 326 }
 327
 328 #footnotes div.footnote {
 329   margin: 0 0 5px 0;
 330 }
 331
 332 #footnotes hr {
 333   border: none;
 334   border-top: 1px solid silver;
 335   height: 1px;
 336   text-align: left;
 337   margin-left: 0;
 338   width: 20%;
 339   min-width: 100px;
 340 }
 341
 342
 343 @media print {
 344   div#footer-badges { display: none; }
 345 }
 346
 347 div#toc {
 348   margin-bottom: 2.5em;
 349 }
 350
 351 div#toctitle {
 352   color: #527bbd;
 353   font-family: sans-serif;
 354   font-size: 1.1em;
 355   font-weight: bold;
 356   margin-top: 1.0em;
 357   margin-bottom: 0.1em;
 358 }
 359
 360 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 361   margin-top: 0;
 362   margin-bottom: 0;
 363 }
 364 div.toclevel2 {
 365   margin-left: 2em;
 366   font-size: 0.9em;
 367 }
 368 div.toclevel3 {
 369   margin-left: 4em;
 370   font-size: 0.9em;
 371 }
 372 div.toclevel4 {
 373   margin-left: 6em;
 374   font-size: 0.9em;
 375 }
 376 /* Workarounds for IE6's broken and incomplete CSS2. */
 377
 378 div.sidebar-content {
 379   background: #ffffee;
 380   border: 1px solid silver;
 381   padding: 0.5em;
 382 }
 383 div.sidebar-title, div.image-title {
 384   color: #527bbd;
 385   font-family: sans-serif;
 386   font-weight: bold;
 387   margin-top: 0.0em;
 388   margin-bottom: 0.5em;
 389 }
 390
 391 div.listingblock div.content {
 392   border: 1px solid silver;
 393   background: #f4f4f4;
 394   padding: 0.5em;
 395 }
 396
 397 div.quoteblock-attribution {
 398   padding-top: 0.5em;
 399   text-align: right;
 400 }
 401
 402 div.verseblock-content {
 403   white-space: pre;
 404 }
 405 div.verseblock-attribution {
 406   padding-top: 0.75em;
 407   text-align: left;
 408 }
 409
 410 div.exampleblock-content {
 411   border-left: 3px solid #dddddd;
 412   padding-left: 0.5em;
 413 }
 414
 415 /* IE6 sets dynamically generated links as visited. */
 416 div#toc a:visited { color: blue; }
 417 </style>
 418 <script type="text/javascript">
 419 /*<![CDATA[*/
 420 window.onload = function(){asciidoc.footnotes();}
 421 var asciidoc = {  // Namespace.
 422
 423 /////////////////////////////////////////////////////////////////////
 424 // Table Of Contents generator
 425 /////////////////////////////////////////////////////////////////////
 426
 427 /* Author: Mihai Bazon, September 2002
 428  * http://students.infoiasi.ro/~mishoo
 429  *
 430  * Table Of Content generator
 431  * Version: 0.4
 432  *
 433  * Feel free to use this script under the terms of the GNU General Public
 434  * License, as long as you do not remove or alter this notice.
 435  */
 436
 437  /* modified by Troy D. Hanson, September 2006. License: GPL */
 438  /* modified by Stuart Rackham, 2006, 2009. License: GPL */
 439
 440 // toclevels = 1..4.
 441 toc: function (toclevels) {
 442
 443   function getText(el) {
 444     var text = "";
 445     for (var i = el.firstChild; i != null; i = i.nextSibling) {
 446       if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
 447         text += i.data;
 448       else if (i.firstChild != null)
 449         text += getText(i);
 450     }
 451     return text;
 452   }
 453
 454   function TocEntry(el, text, toclevel) {
 455     this.element = el;
 456     this.text = text;
 457     this.toclevel = toclevel;
 458   }
 459
 460   function tocEntries(el, toclevels) {
 461     var result = new Array;
 462     var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
 463     // Function that scans the DOM tree for header elements (the DOM2
 464     // nodeIterator API would be a better technique but not supported by all
 465     // browsers).
 466     var iterate = function (el) {
 467       for (var i = el.firstChild; i != null; i = i.nextSibling) {
 468         if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
 469           var mo = re.exec(i.tagName);
 470           if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
 471             result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
 472           }
 473           iterate(i);
 474         }
 475       }
 476     }
 477     iterate(el);
 478     return result;
 479   }
 480
 481   var toc = document.getElementById("toc");
 482   var entries = tocEntries(document.getElementById("content"), toclevels);
 483   for (var i = 0; i < entries.length; ++i) {
 484     var entry = entries[i];
 485     if (entry.element.id == "")
 486       entry.element.id = "_toc_" + i;
 487     var a = document.createElement("a");
 488     a.href = "#" + entry.element.id;
 489     a.appendChild(document.createTextNode(entry.text));
 490     var div = document.createElement("div");
 491     div.appendChild(a);
 492     div.className = "toclevel" + entry.toclevel;
 493     toc.appendChild(div);
 494   }
 495   if (entries.length == 0)
 496     toc.parentNode.removeChild(toc);
 497 },
 498
 499
 500 /////////////////////////////////////////////////////////////////////
 501 // Footnotes generator
 502 /////////////////////////////////////////////////////////////////////
 503
 504 /* Based on footnote generation code from:
 505  * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 506  */
 507
 508 footnotes: function () {
 509   var cont = document.getElementById("content");
 510   var noteholder = document.getElementById("footnotes");
 511   var spans = cont.getElementsByTagName("span");
 512   var refs = {};
 513   var n = 0;
 514   for (i=0; i<spans.length; i++) {
 515     if (spans[i].className == "footnote") {
 516       n++;
 517       // Use [\s\S] in place of . so multi-line matches work.
 518       // Because JavaScript has no s (dotall) regex flag.
 519       note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
 520       noteholder.innerHTML +=
 521         "<div class='footnote' id='_footnote_" + n + "'>" +
 522         "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
 523         n + "</a>. " + note + "</div>";
 524       spans[i].innerHTML =
 525         "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
 526         "' title='View footnote' class='footnote'>" + n + "</a>]";
 527       var id =spans[i].getAttribute("id");
 528       if (id != null) refs["#"+id] = n;
 529     }
 530   }
 531   if (n == 0)
 532     noteholder.parentNode.removeChild(noteholder);
 533   else {
 534     // Process footnoterefs.
 535     for (i=0; i<spans.length; i++) {
 536       if (spans[i].className == "footnoteref") {
 537         var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
 538         href = href.match(/#.*/)[0];  // Because IE return full URL.
 539         n = refs[href];
 540         spans[i].innerHTML =
 541           "[<a href='#_footnote_" + n +
 542           "' title='View footnote' class='footnote'>" + n + "</a>]";
 543       }
 544     }
 545   }
 546 }
 547
 548 }
 549 /*]]>*/
 550 </script>
 551 </head>
 552 <body>
 553 <div id="header">
 554 <h1>Reverting an existing commit</h1>
 555 </div>
 556 <div id="content">
 557 <div id="preamble">
 558 <div class="sectionbody">
 559 <div class="paragraph"><p>One of the changes I pulled into the <em>master</em> branch turns out to
 560 break building GIT with GCC 2.95.  While they were well intentioned
 561 portability fixes, keeping things working with gcc-2.95 was also
 562 important.  Here is what I did to revert the change in the <em>master</em>
 563 branch and to adjust the <em>pu</em> branch, using core GIT tools and
 564 barebone Porcelain.</p></div>
 565 <div class="paragraph"><p>First, prepare a throw-away branch in case I screw things up.</p></div>
 566 <div class="listingblock">
 567 <div class="content">
 568 <pre><tt>$ git checkout -b revert-c99 master</tt></pre>
 569 </div></div>
 570 <div class="paragraph"><p>Now I am on the <em>revert-c99</em> branch.  Let&#8217;s figure out which commit to
 571 revert.  I happen to know that the top of the <em>master</em> branch is a
 572 merge, and its second parent (i.e. foreign commit I merged from) has
 573 the change I would want to undo.  Further I happen to know that that
 574 merge introduced 5 commits or so:</p></div>
 575 <div class="listingblock">
 576 <div class="content">
 577 <pre><tt>$ git show-branch --more=4 master master^2 | head
 578 * [master] Merge refs/heads/portable from http://www.cs.berkeley....
 579  ! [master^2] Replace C99 array initializers with code.
 580 --
 581 -  [master] Merge refs/heads/portable from http://www.cs.berkeley....
 582 *+ [master^2] Replace C99 array initializers with code.
 583 *+ [master^2~1] Replace unsetenv() and setenv() with older putenv().
 584 *+ [master^2~2] Include sys/time.h in daemon.c.
 585 *+ [master^2~3] Fix ?: statements.
 586 *+ [master^2~4] Replace zero-length array decls with [].
 587 *  [master~1] tutorial note about git branch</tt></pre>
 588 </div></div>
 589 <div class="paragraph"><p>The <em>--more=4</em> above means "after we reach the merge base of refs,
 590 show until we display four more common commits".  That last commit
 591 would have been where the "portable" branch was forked from the main
 592 git.git repository, so this would show everything on both branches
 593 since then.  I just limited the output to the first handful using
 594 <em>head</em>.</p></div>
 595 <div class="paragraph"><p>Now I know <em>master^2~4</em> (pronounce it as "find the second parent of
 596 the <em>master</em>, and then go four generations back following the first
 597 parent") is the one I would want to revert.  Since I also want to say
 598 why I am reverting it, the <em>-n</em> flag is given to <em>git revert</em>.  This
 599 prevents it from actually making a commit, and instead <em>git revert</em>
 600 leaves the commit log message it wanted to use in <em>.msg</em> file:</p></div>
 601 <div class="listingblock">
 602 <div class="content">
 603 <pre><tt>$ git revert -n master^2~4
 604 $ cat .msg
 605 Revert "Replace zero-length array decls with []."
 606
 607 This reverts 6c5f9baa3bc0d63e141e0afc23110205379905a4 commit.
 608 $ git diff HEAD ;# to make sure what we are reverting makes sense.
 609 $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.
 610 $ make clean test ;# make sure it did not cause other breakage.</tt></pre>
 611 </div></div>
 612 <div class="paragraph"><p>The reverted change makes sense (from reading the <em>diff</em> output), does
 613 fix the problem (from <em>make CC=gcc-2.95</em> test), and does not cause new
 614 breakage (from the last <em>make test</em>).  I&#8217;m ready to commit:</p></div>
 615 <div class="listingblock">
 616 <div class="content">
 617 <pre><tt>$ git commit -a -s ;# read .msg into the log,
 618                     # and explain why I am reverting.</tt></pre>
 619 </div></div>
 620 <div class="paragraph"><p>I could have screwed up in any of the above steps, but in the worst
 621 case I could just have done <em>git checkout master</em> to start over.
 622 Fortunately I did not have to; what I have in the current branch
 623 <em>revert-c99</em> is what I want.  So merge that back into <em>master</em>:</p></div>
 624 <div class="listingblock">
 625 <div class="content">
 626 <pre><tt>$ git checkout master
 627 $ git merge revert-c99 ;# this should be a fast-forward
 628 Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
 629  cache.h        |    8 ++++----
 630  commit.c       |    2 +-
 631  ls-files.c     |    2 +-
 632  receive-pack.c |    2 +-
 633  server-info.c  |    2 +-
 634  5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre>
 635 </div></div>
 636 <div class="paragraph"><p>There is no need to redo the test at this point.  We fast-forwarded
 637 and we know <em>master</em> matches <em>revert-c99</em> exactly.  In fact:</p></div>
 638 <div class="listingblock">
 639 <div class="content">
 640 <pre><tt>$ git diff master..revert-c99</tt></pre>
 641 </div></div>
 642 <div class="paragraph"><p>says nothing.</p></div>
 643 <div class="paragraph"><p>Then we rebase the <em>pu</em> branch as usual.</p></div>
 644 <div class="listingblock">
 645 <div class="content">
 646 <pre><tt>$ git checkout pu
 647 $ git tag pu-anchor pu
 648 $ git rebase master
 649 * Applying: Redo "revert" using three-way merge machinery.
 650 First trying simple merge strategy to cherry-pick.
 651 * Applying: Remove git-apply-patch-script.
 652 First trying simple merge strategy to cherry-pick.
 653 Simple cherry-pick fails; trying Automatic cherry-pick.
 654 Removing Documentation/git-apply-patch-script.txt
 655 Removing git-apply-patch-script
 656 * Applying: Document "git cherry-pick" and "git revert"
 657 First trying simple merge strategy to cherry-pick.
 658 * Applying: mailinfo and applymbox updates
 659 First trying simple merge strategy to cherry-pick.
 660 * Applying: Show commits in topo order and name all commits.
 661 First trying simple merge strategy to cherry-pick.
 662 * Applying: More documentation updates.
 663 First trying simple merge strategy to cherry-pick.</tt></pre>
 664 </div></div>
 665 <div class="paragraph"><p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git
 666 rebase</em> screws up.  After this, I can do these for sanity check:</p></div>
 667 <div class="listingblock">
 668 <div class="content">
 669 <pre><tt>$ git diff pu-anchor..pu ;# make sure we got the master fix.
 670 $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.
 671 $ make clean test ;# make sure it did not cause other breakage.</tt></pre>
 672 </div></div>
 673 <div class="paragraph"><p>Everything is in the good order.  I do not need the temporary branch
 674 nor tag anymore, so remove them:</p></div>
 675 <div class="listingblock">
 676 <div class="content">
 677 <pre><tt>$ rm -f .git/refs/tags/pu-anchor
 678 $ git branch -d revert-c99</tt></pre>
 679 </div></div>
 680 <div class="paragraph"><p>It was an emergency fix, so we might as well merge it into the
 681 <em>release candidate</em> branch, although I expect the next release would
 682 be some days off:</p></div>
 683 <div class="listingblock">
 684 <div class="content">
 685 <pre><tt>$ git checkout rc
 686 $ git pull . master
 687 Packing 0 objects
 688 Unpacking 0 objects
 689
 690 * committish: e3a693c...        refs/heads/master from .
 691 Trying to merge e3a693c... into 8c1f5f0... using 10d781b...
 692 Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 693  cache.h        |    8 ++++----
 694  commit.c       |    2 +-
 695  ls-files.c     |    2 +-
 696  receive-pack.c |    2 +-
 697  server-info.c  |    2 +-
 698  5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre>
 699 </div></div>
 700 <div class="paragraph"><p>And the final repository status looks like this:</p></div>
 701 <div class="listingblock">
 702 <div class="content">
 703 <pre><tt>$ git show-branch --more=1 master pu rc
 704 ! [master] Revert "Replace zero-length array decls with []."
 705  ! [pu] git-repack: Add option to repack all objects.
 706   * [rc] Merge refs/heads/master from .
 707 ---
 708  +  [pu] git-repack: Add option to repack all objects.
 709  +  [pu~1] More documentation updates.
 710  +  [pu~2] Show commits in topo order and name all commits.
 711  +  [pu~3] mailinfo and applymbox updates
 712  +  [pu~4] Document "git cherry-pick" and "git revert"
 713  +  [pu~5] Remove git-apply-patch-script.
 714  +  [pu~6] Redo "revert" using three-way merge machinery.
 715   - [rc] Merge refs/heads/master from .
 716 ++* [master] Revert "Replace zero-length array decls with []."
 717   - [rc~1] Merge refs/heads/master from .
 718 ... [master~1] Merge refs/heads/portable from http://www.cs.berkeley....</tt></pre>
 719 </div></div>
 720 </div>
 721 </div>
 722 </div>
 723 <div id="footnotes"><hr /></div>
 724 <div id="footer">
 725 <div id="footer-text">
 726 Last updated 2011-09-21 23:17:57 PDT
 727 </div>
 728 </div>
 729 </body>
 730 </html>