howto/maintain-git.html

   1 <!DOCTYPE html>
   2 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   3 <head>
   4 <meta charset="UTF-8"/>
   5 <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
   6 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
   7 <meta name="generator" content="Asciidoctor 2.0.20"/>
   8 <title>How to maintain Git</title>
   9 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"/>
  10 <style>
  11 /*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
  12 /* Uncomment the following line when using as a custom stylesheet */
  13 /* @import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700"; */
  14 html{font-family:sans-serif;-webkit-text-size-adjust:100%}
  15 a{background:none}
  16 a:focus{outline:thin dotted}
  17 a:active,a:hover{outline:0}
  18 h1{font-size:2em;margin:.67em 0}
  19 b,strong{font-weight:bold}
  20 abbr{font-size:.9em}
  21 abbr[title]{cursor:help;border-bottom:1px dotted #dddddf;text-decoration:none}
  22 dfn{font-style:italic}
  23 hr{height:0}
  24 mark{background:#ff0;color:#000}
  25 code,kbd,pre,samp{font-family:monospace;font-size:1em}
  26 pre{white-space:pre-wrap}
  27 q{quotes:"\201C" "\201D" "\2018" "\2019"}
  28 small{font-size:80%}
  29 sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
  30 sup{top:-.5em}
  31 sub{bottom:-.25em}
  32 img{border:0}
  33 svg:not(:root){overflow:hidden}
  34 figure{margin:0}
  35 audio,video{display:inline-block}
  36 audio:not([controls]){display:none;height:0}
  37 fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
  38 legend{border:0;padding:0}
  39 button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
  40 button,input{line-height:normal}
  41 button,select{text-transform:none}
  42 button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}
  43 button[disabled],html input[disabled]{cursor:default}
  44 input[type=checkbox],input[type=radio]{padding:0}
  45 button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
  46 textarea{overflow:auto;vertical-align:top}
  47 table{border-collapse:collapse;border-spacing:0}
  48 *,::before,::after{box-sizing:border-box}
  49 html,body{font-size:100%}
  50 body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;line-height:1;position:relative;cursor:auto;-moz-tab-size:4;-o-tab-size:4;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
  51 a:hover{cursor:pointer}
  52 img,object,embed{max-width:100%;height:auto}
  53 object,embed{height:100%}
  54 img{-ms-interpolation-mode:bicubic}
  55 .left{float:left!important}
  56 .right{float:right!important}
  57 .text-left{text-align:left!important}
  58 .text-right{text-align:right!important}
  59 .text-center{text-align:center!important}
  60 .text-justify{text-align:justify!important}
  61 .hide{display:none}
  62 img,object,svg{display:inline-block;vertical-align:middle}
  63 textarea{height:auto;min-height:50px}
  64 select{width:100%}
  65 .subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
  66 div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
  67 a{color:#2156a5;text-decoration:underline;line-height:inherit}
  68 a:hover,a:focus{color:#1d4b8f}
  69 a img{border:0}
  70 p{line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
  71 p aside{font-size:.875em;line-height:1.35;font-style:italic}
  72 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
  73 h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
  74 h1{font-size:2.125em}
  75 h2{font-size:1.6875em}
  76 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
  77 h4,h5{font-size:1.125em}
  78 h6{font-size:1em}
  79 hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em}
  80 em,i{font-style:italic;line-height:inherit}
  81 strong,b{font-weight:bold;line-height:inherit}
  82 small{font-size:60%;line-height:inherit}
  83 code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
  84 ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
  85 ul,ol{margin-left:1.5em}
  86 ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
  87 ul.circle{list-style-type:circle}
  88 ul.disc{list-style-type:disc}
  89 ul.square{list-style-type:square}
  90 ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
  91 ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
  92 dl dt{margin-bottom:.3125em;font-weight:bold}
  93 dl dd{margin-bottom:1.25em}
  94 blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
  95 blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
  96 @media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
  97 h1{font-size:2.75em}
  98 h2{font-size:2.3125em}
  99 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
 100 h4{font-size:1.4375em}}
 101 table{background:#fff;margin-bottom:1.25em;border:1px solid #dedede;word-wrap:normal}
 102 table thead,table tfoot{background:#f7f8f7}
 103 table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
 104 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 105 table tr.even,table tr.alt{background:#f8f8f7}
 106 table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
 107 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
 108 h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
 109 .center{margin-left:auto;margin-right:auto}
 110 .stretch{width:100%}
 111 .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
 112 .clearfix::after,.float-group::after{clear:both}
 113 :not(pre).nobreak{word-wrap:normal}
 114 :not(pre).nowrap{white-space:nowrap}
 115 :not(pre).pre-wrap{white-space:pre-wrap}
 116 :not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 117 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 118 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
 119 pre>code{display:block}
 120 pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
 121 em em{font-style:normal}
 122 strong strong{font-weight:400}
 123 .keyseq{color:rgba(51,51,51,.8)}
 124 kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 0 rgba(0,0,0,.2),inset 0 0 0 .1em #fff;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
 125 .keyseq kbd:first-child{margin-left:0}
 126 .keyseq kbd:last-child{margin-right:0}
 127 .menuseq,.menuref{color:#000}
 128 .menuseq b:not(.caret),.menuref{font-weight:inherit}
 129 .menuseq{word-spacing:-.02em}
 130 .menuseq b.caret{font-size:1.25em;line-height:.8}
 131 .menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
 132 b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
 133 b.button::before{content:"[";padding:0 3px 0 2px}
 134 b.button::after{content:"]";padding:0 2px 0 3px}
 135 p a>code:hover{color:rgba(0,0,0,.9)}
 136 #header,#content,#footnotes,#footer{width:100%;margin:0 auto;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
 137 #header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
 138 #header::after,#content::after,#footnotes::after,#footer::after{clear:both}
 139 #content{margin-top:1.25em}
 140 #content::before{content:none}
 141 #header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
 142 #header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
 143 #header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
 144 #header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:flex;flex-flow:row wrap}
 145 #header .details span:first-child{margin-left:-.125em}
 146 #header .details span.email a{color:rgba(0,0,0,.85)}
 147 #header .details br{display:none}
 148 #header .details br+span::before{content:"\00a0\2013\00a0"}
 149 #header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
 150 #header .details br+span#revremark::before{content:"\00a0|\00a0"}
 151 #header #revnumber{text-transform:capitalize}
 152 #header #revnumber::after{content:"\00a0"}
 153 #content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
 154 #toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
 155 #toc>ul{margin-left:.125em}
 156 #toc ul.sectlevel0>li>a{font-style:italic}
 157 #toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
 158 #toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
 159 #toc li{line-height:1.3334;margin-top:.3334em}
 160 #toc a{text-decoration:none}
 161 #toc a:active{text-decoration:underline}
 162 #toctitle{color:#7a2518;font-size:1.2em}
 163 @media screen and (min-width:768px){#toctitle{font-size:1.375em}
 164 body.toc2{padding-left:15em;padding-right:0}
 165 #toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
 166 #toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
 167 #toc.toc2>ul{font-size:.9em;margin-bottom:0}
 168 #toc.toc2 ul ul{margin-left:0;padding-left:1em}
 169 #toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
 170 body.toc2.toc-right{padding-left:0;padding-right:15em}
 171 body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
 172 @media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
 173 #toc.toc2{width:20em}
 174 #toc.toc2 #toctitle{font-size:1.375em}
 175 #toc.toc2>ul{font-size:.95em}
 176 #toc.toc2 ul ul{padding-left:1.25em}
 177 body.toc2.toc-right{padding-left:0;padding-right:20em}}
 178 #content #toc{border:1px solid #e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;border-radius:4px}
 179 #content #toc>:first-child{margin-top:0}
 180 #content #toc>:last-child{margin-bottom:0}
 181 #footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
 182 #footer-text{color:hsla(0,0%,100%,.8);line-height:1.44}
 183 #content{margin-bottom:.625em}
 184 .sect1{padding-bottom:.625em}
 185 @media screen and (min-width:768px){#content{margin-bottom:1.25em}
 186 .sect1{padding-bottom:1.25em}}
 187 .sect1:last-child{padding-bottom:0}
 188 .sect1+.sect1{border-top:1px solid #e7e7e9}
 189 #content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
 190 #content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
 191 #content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
 192 #content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
 193 #content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
 194 details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
 195 details{margin-left:1.25rem}
 196 details>summary{cursor:pointer;display:block;position:relative;line-height:1.6;margin-bottom:.625rem;outline:none;-webkit-tap-highlight-color:transparent}
 197 details>summary::-webkit-details-marker{display:none}
 198 details>summary::before{content:"";border:solid transparent;border-left:solid;border-width:.3em 0 .3em .5em;position:absolute;top:.5em;left:-1.25rem;transform:translateX(15%)}
 199 details[open]>summary::before{border:solid transparent;border-top:solid;border-width:.5em .3em 0;transform:translateY(15%)}
 200 details>summary::after{content:"";width:1.25rem;height:1em;position:absolute;top:.3em;left:-1.25rem}
 201 .admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
 202 table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
 203 .paragraph.lead>p,#preamble>.sectionbody>[class=paragraph]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
 204 .admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
 205 .admonitionblock>table td.icon{text-align:center;width:80px}
 206 .admonitionblock>table td.icon img{max-width:none}
 207 .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
 208 .admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
 209 .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
 210 .exampleblock>.content{border:1px solid #e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;border-radius:4px}
 211 .sidebarblock{border:1px solid #dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;border-radius:4px}
 212 .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
 213 .exampleblock>.content>:first-child,.sidebarblock>.content>:first-child{margin-top:0}
 214 .exampleblock>.content>:last-child,.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
 215 .literalblock pre,.listingblock>.content>pre{border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
 216 @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
 217 @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
 218 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class=highlight],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
 219 .literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
 220 .listingblock>.content{position:relative}
 221 .listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
 222 .listingblock:hover code[data-lang]::before{display:block}
 223 .listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
 224 .listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
 225 .listingblock pre.highlightjs{padding:0}
 226 .listingblock pre.highlightjs>code{padding:1em;border-radius:4px}
 227 .listingblock pre.prettyprint{border-width:0}
 228 .prettyprint{background:#f7f7f8}
 229 pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
 230 pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
 231 pre.prettyprint li code[data-lang]::before{opacity:1}
 232 pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
 233 table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
 234 table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
 235 table.linenotable td.code{padding-left:.75em}
 236 table.linenotable td.linenos,pre.pygments .linenos{border-right:1px solid;opacity:.35;padding-right:.5em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 237 pre.pygments span.linenos{display:inline-block;margin-right:.75em}
 238 .quoteblock{margin:0 1em 1.25em 1.5em;display:table}
 239 .quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
 240 .quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
 241 .quoteblock blockquote{margin:0;padding:0;border:0}
 242 .quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
 243 .quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
 244 .quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
 245 .verseblock{margin:0 1em 1.25em}
 246 .verseblock pre{font-family:"Open Sans","DejaVu Sans",sans-serif;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
 247 .verseblock pre strong{font-weight:400}
 248 .verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
 249 .quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
 250 .quoteblock .attribution br,.verseblock .attribution br{display:none}
 251 .quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
 252 .quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
 253 .quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
 254 .quoteblock.abstract{margin:0 1em 1.25em;display:block}
 255 .quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
 256 .quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
 257 .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
 258 .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
 259 .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0}
 260 p.tableblock:last-child{margin-bottom:0}
 261 td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
 262 td.tableblock>.content>:last-child{margin-bottom:-1.25em}
 263 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
 264 table.grid-all>*>tr>*{border-width:1px}
 265 table.grid-cols>*>tr>*{border-width:0 1px}
 266 table.grid-rows>*>tr>*{border-width:1px 0}
 267 table.frame-all{border-width:1px}
 268 table.frame-ends{border-width:1px 0}
 269 table.frame-sides{border-width:0 1px}
 270 table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
 271 table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
 272 table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
 273 table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
 274 table.stripes-all>*>tr,table.stripes-odd>*>tr:nth-of-type(odd),table.stripes-even>*>tr:nth-of-type(even),table.stripes-hover>*>tr:hover{background:#f8f8f7}
 275 th.halign-left,td.halign-left{text-align:left}
 276 th.halign-right,td.halign-right{text-align:right}
 277 th.halign-center,td.halign-center{text-align:center}
 278 th.valign-top,td.valign-top{vertical-align:top}
 279 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
 280 th.valign-middle,td.valign-middle{vertical-align:middle}
 281 table thead th,table tfoot th{font-weight:bold}
 282 tbody tr th{background:#f7f8f7}
 283 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
 284 p.tableblock>code:only-child{background:none;padding:0}
 285 p.tableblock{font-size:1em}
 286 ol{margin-left:1.75em}
 287 ul li ol{margin-left:1.5em}
 288 dl dd{margin-left:1.125em}
 289 dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
 290 li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
 291 ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
 292 ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
 293 ul.unstyled,ol.unstyled{margin-left:0}
 294 li>p:empty:only-child::before{content:"";display:inline-block}
 295 ul.checklist>li>p:first-child{margin-left:-1em}
 296 ul.checklist>li>p:first-child>.fa-square-o:first-child,ul.checklist>li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
 297 ul.checklist>li>p:first-child>input[type=checkbox]:first-child{margin-right:.25em}
 298 ul.inline{display:flex;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
 299 ul.inline>li{margin-left:1.25em}
 300 .unstyled dl dt{font-weight:400;font-style:normal}
 301 ol.arabic{list-style-type:decimal}
 302 ol.decimal{list-style-type:decimal-leading-zero}
 303 ol.loweralpha{list-style-type:lower-alpha}
 304 ol.upperalpha{list-style-type:upper-alpha}
 305 ol.lowerroman{list-style-type:lower-roman}
 306 ol.upperroman{list-style-type:upper-roman}
 307 ol.lowergreek{list-style-type:lower-greek}
 308 .hdlist>table,.colist>table{border:0;background:none}
 309 .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
 310 td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
 311 td.hdlist1{font-weight:bold;padding-bottom:1.25em}
 312 td.hdlist2{word-wrap:anywhere}
 313 .literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
 314 .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
 315 .colist td:not([class]):first-child img{max-width:none}
 316 .colist td:not([class]):last-child{padding:.25em 0}
 317 .thumb,.th{line-height:0;display:inline-block;border:4px solid #fff;box-shadow:0 0 0 1px #ddd}
 318 .imageblock.left{margin:.25em .625em 1.25em 0}
 319 .imageblock.right{margin:.25em 0 1.25em .625em}
 320 .imageblock>.title{margin-bottom:0}
 321 .imageblock.thumb,.imageblock.th{border-width:6px}
 322 .imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
 323 .image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
 324 .image.left{margin-right:.625em}
 325 .image.right{margin-left:.625em}
 326 a.image{text-decoration:none;display:inline-block}
 327 a.image object{pointer-events:none}
 328 sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
 329 sup.footnote a,sup.footnoteref a{text-decoration:none}
 330 sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
 331 #footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
 332 #footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
 333 #footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
 334 #footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
 335 #footnotes .footnote:last-of-type{margin-bottom:0}
 336 #content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
 337 div.unbreakable{page-break-inside:avoid}
 338 .big{font-size:larger}
 339 .small{font-size:smaller}
 340 .underline{text-decoration:underline}
 341 .overline{text-decoration:overline}
 342 .line-through{text-decoration:line-through}
 343 .aqua{color:#00bfbf}
 344 .aqua-background{background:#00fafa}
 345 .black{color:#000}
 346 .black-background{background:#000}
 347 .blue{color:#0000bf}
 348 .blue-background{background:#0000fa}
 349 .fuchsia{color:#bf00bf}
 350 .fuchsia-background{background:#fa00fa}
 351 .gray{color:#606060}
 352 .gray-background{background:#7d7d7d}
 353 .green{color:#006000}
 354 .green-background{background:#007d00}
 355 .lime{color:#00bf00}
 356 .lime-background{background:#00fa00}
 357 .maroon{color:#600000}
 358 .maroon-background{background:#7d0000}
 359 .navy{color:#000060}
 360 .navy-background{background:#00007d}
 361 .olive{color:#606000}
 362 .olive-background{background:#7d7d00}
 363 .purple{color:#600060}
 364 .purple-background{background:#7d007d}
 365 .red{color:#bf0000}
 366 .red-background{background:#fa0000}
 367 .silver{color:#909090}
 368 .silver-background{background:#bcbcbc}
 369 .teal{color:#006060}
 370 .teal-background{background:#007d7d}
 371 .white{color:#bfbfbf}
 372 .white-background{background:#fafafa}
 373 .yellow{color:#bfbf00}
 374 .yellow-background{background:#fafa00}
 375 span.icon>.fa{cursor:default}
 376 a span.icon>.fa{cursor:inherit}
 377 .admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
 378 .admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
 379 .admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
 380 .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
 381 .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
 382 .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
 383 .conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
 384 .conum[data-value] *{color:#fff!important}
 385 .conum[data-value]+b{display:none}
 386 .conum[data-value]::after{content:attr(data-value)}
 387 pre .conum[data-value]{position:relative;top:-.125em}
 388 b.conum *{color:inherit!important}
 389 .conum:not([data-value]):empty{display:none}
 390 dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
 391 h1,h2,p,td.content,span.alt,summary{letter-spacing:-.01em}
 392 p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
 393 p,blockquote,dt,td.content,td.hdlist1,span.alt,summary{font-size:1.0625rem}
 394 p{margin-bottom:1.25rem}
 395 .sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
 396 .exampleblock>.content{background:#fffef7;border-color:#e0e0dc;box-shadow:0 1px 4px #e0e0dc}
 397 .print-only{display:none!important}
 398 @page{margin:1.25cm .75cm}
 399 @media print{*{box-shadow:none!important;text-shadow:none!important}
 400 html{font-size:80%}
 401 a{color:inherit!important;text-decoration:underline!important}
 402 a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
 403 a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
 404 abbr[title]{border-bottom:1px dotted}
 405 abbr[title]::after{content:" (" attr(title) ")"}
 406 pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
 407 thead{display:table-header-group}
 408 svg{max-width:100%}
 409 p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
 410 h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
 411 #header,#content,#footnotes,#footer{max-width:none}
 412 #toc,.sidebarblock,.exampleblock>.content{background:none!important}
 413 #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
 414 body.book #header{text-align:center}
 415 body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
 416 body.book #header .details{border:0!important;display:block;padding:0!important}
 417 body.book #header .details span:first-child{margin-left:0!important}
 418 body.book #header .details br{display:block}
 419 body.book #header .details br+span::before{content:none!important}
 420 body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
 421 body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
 422 .listingblock code[data-lang]::before{display:block}
 423 #footer{padding:0 .9375em}
 424 .hide-on-print{display:none!important}
 425 .print-only{display:block!important}
 426 .hide-for-print{display:none!important}
 427 .show-for-print{display:inherit!important}}
 428 @media amzn-kf8,print{#header>h1:first-child{margin-top:1.25rem}
 429 .sect1{padding:0!important}
 430 .sect1+.sect1{border:0}
 431 #footer{background:none}
 432 #footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
 433 @media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
 434 </style>
 435 <style>
 436 pre>code {
 437    display: inline;
 438 }
 439 </style>
 440 </head>
 441 <body class="article">
 442 <div id="header">
 443 <h1>How to maintain Git</h1>
 444 <div class="details">
 445 <span id="revdate">2024-09-10</span>
 446 </div>
 447 </div>
 448 <div id="content">
 449 <div class="sect1">
 450 <h2 id="_activities">Activities</h2>
 451 <div class="sectionbody">
 452 <div class="paragraph">
 453 <p>The maintainer&#8217;s Git time is spent on three activities.</p>
 454 </div>
 455 <div class="ulist">
 456 <ul>
 457 <li>
 458 <p>Communication (45%)</p>
 459 <div class="literalblock">
 460 <div class="content">
 461 <pre>Mailing list discussions on general design, fielding user
 462 questions, diagnosing bug reports; reviewing, commenting on,
 463 suggesting alternatives to, and rejecting patches.</pre>
 464 </div>
 465 </div>
 466 </li>
 467 <li>
 468 <p>Integration (50%)</p>
 469 <div class="literalblock">
 470 <div class="content">
 471 <pre>Applying new patches from the contributors while spotting and
 472 correcting minor mistakes, shuffling the integration and
 473 testing branches, pushing the results out, cutting the
 474 releases, and making announcements.</pre>
 475 </div>
 476 </div>
 477 </li>
 478 <li>
 479 <p>Own development (5%)</p>
 480 <div class="literalblock">
 481 <div class="content">
 482 <pre>Scratching my own itch and sending proposed patch series out.</pre>
 483 </div>
 484 </div>
 485 </li>
 486 </ul>
 487 </div>
 488 </div>
 489 </div>
 490 <div class="sect1">
 491 <h2 id="_the_policy">The Policy</h2>
 492 <div class="sectionbody">
 493 <div class="paragraph">
 494 <p>The policy on Integration is informally mentioned in "A Note
 495 from the maintainer" message, which is periodically posted to
 496 the mailing list after each feature release is made:</p>
 497 </div>
 498 <div class="ulist">
 499 <ul>
 500 <li>
 501 <p>Feature releases are numbered as vX.Y.0 and are meant to
 502 contain bugfixes and enhancements in any area, including
 503 functionality, performance and usability, without regression.</p>
 504 </li>
 505 <li>
 506 <p>Maintenance releases are numbered as vX.Y.Z (0 &lt; Z) and are meant
 507 to contain only bugfixes for the corresponding vX.Y.0 feature
 508 release and earlier maintenance releases vX.Y.W (W &lt; Z).</p>
 509 </li>
 510 <li>
 511 <p>The <em>master</em> branch is used to prepare for the next feature
 512 release. In other words, at some point, the tip of <em>master</em>
 513 branch is tagged as vX.(Y+1).0, when vX.Y.0 is the latest
 514 feature release.</p>
 515 </li>
 516 <li>
 517 <p><em>maint</em> branch is used to prepare for the next maintenance
 518 release.  After the feature release vX.Y.0 is made, the tip
 519 of <em>maint</em> branch is set to that release, and bugfixes will
 520 accumulate on the branch, and at some point, the tip of the
 521 branch is tagged with vX.Y.1, vX.Y.2, and so on.</p>
 522 </li>
 523 <li>
 524 <p><em>next</em> branch is used to publish changes (both enhancements
 525 and fixes) that (1) have worthwhile goal, (2) are in a fairly
 526 good shape suitable for everyday use, (3) but have not yet
 527 demonstrated to be regression free.  Reviews from contributors on
 528 the mailing list help to make the determination.  After a topic
 529 is merged to <em>next</em>, it is tested for at least 7 calendar days
 530 before getting merged to <em>master</em>.</p>
 531 </li>
 532 <li>
 533 <p><em>seen</em> branch is used to publish other proposed changes that do
 534 not yet pass the criteria set for <em>next</em> (see above).</p>
 535 </li>
 536 <li>
 537 <p>The tips of <em>master</em> and <em>maint</em> branches will not be rewound to
 538 allow people to build their own customization on top of them.
 539 Early in a new development cycle, <em>next</em> is rewound to the tip of
 540 <em>master</em> once, but otherwise it will not be rewound until the end
 541 of the cycle.</p>
 542 </li>
 543 <li>
 544 <p>Usually <em>master</em> contains all of <em>maint</em> and <em>next</em> contains all
 545 of <em>master</em>.  <em>seen</em> contains all the topics merged to <em>next</em>, but
 546 is rebuilt directly on <em>master</em>.</p>
 547 </li>
 548 <li>
 549 <p>The tip of <em>master</em> is meant to be more stable than any
 550 tagged releases, and the users are encouraged to follow it.</p>
 551 </li>
 552 <li>
 553 <p>The <em>next</em> branch is where new action takes place, and the
 554 users are encouraged to test it so that regressions and bugs
 555 are found before new topics are merged to <em>master</em>.</p>
 556 </li>
 557 <li>
 558 <p>When a problem is found in a topic in <em>next</em>, the topic is marked
 559 not to be merged to <em>master</em>.  Follow-up patches are discussed on
 560 the mailing list and applied to the topic after being reviewed and
 561 then the topic is merged (again) to <em>next</em>.  After going through
 562 the usual testing in <em>next</em>, the entire (fixed) topic is merged
 563 to <em>master</em>.</p>
 564 </li>
 565 <li>
 566 <p>One release cycle for a feature release is expected to last for
 567 eight to ten weeks.  A few "release candidate" releases are
 568 expected to be tagged about a week apart before the final
 569 release, and a "preview" release is tagged about a week before
 570 the first release candidate gets tagged.</p>
 571 </li>
 572 <li>
 573 <p>After the preview release is tagged, topics that were well
 574 reviewed may be merged to <em>master</em> before spending the usual 7
 575 calendar days in <em>next</em>, with the expectation that any bugs in
 576 them can be caught and fixed in the release candidates before
 577 the final release.</p>
 578 </li>
 579 <li>
 580 <p>After the first release candidate is tagged, the contributors are
 581 strongly encouraged to focus on finding and fixing new regressions
 582 introduced during the cycle, over addressing old bugs and any new
 583 features.  Topics stop getting merged down from <em>next</em> to <em>master</em>,
 584 and new topics stop getting merged to <em>next</em>. Unless they are fixes
 585 to new regressions in the cycle, that is.</p>
 586 </li>
 587 <li>
 588 <p>Soon after a feature release is made, the tip of <em>maint</em> gets
 589 fast-forwarded to point at the release.  Topics that have been
 590 kept in <em>next</em> are merged down to <em>master</em> and a new development
 591 cycle starts.</p>
 592 </li>
 593 </ul>
 594 </div>
 595 <div class="paragraph">
 596 <p>Note that before v1.9.0 release, the version numbers used to be
 597 structured slightly differently.  vX.Y.Z were feature releases while
 598 vX.Y.Z.W were maintenance releases for vX.Y.Z.</p>
 599 </div>
 600 </div>
 601 </div>
 602 <div class="sect1">
 603 <h2 id="_a_typical_git_day">A Typical Git Day</h2>
 604 <div class="sectionbody">
 605 <div class="paragraph">
 606 <p>A typical Git day for the maintainer implements the above policy
 607 by doing the following:</p>
 608 </div>
 609 <div class="ulist">
 610 <ul>
 611 <li>
 612 <p>Scan mailing list.  Respond with review comments, suggestions
 613 etc.  Kibitz.  Collect potentially usable patches from the
 614 mailing list.  Patches about a single topic go to one mailbox (I
 615 read my mail in Gnus, and type \C-o to save/append messages in
 616 files in mbox format).</p>
 617 </li>
 618 <li>
 619 <p>Write his own patches to address issues raised on the list but
 620 nobody has stepped up to solve.  Send it out just like other
 621 contributors do, and pick them up just like patches from other
 622 contributors (see above).</p>
 623 </li>
 624 <li>
 625 <p>Review the patches in the saved mailboxes.  Edit proposed log
 626 message for typofixes and clarifications, and add Acks
 627 collected from the list.  Edit patch to incorporate "Oops,
 628 that should have been like this" fixes from the discussion.</p>
 629 </li>
 630 <li>
 631 <p>Classify the collected patches and handle <em>master</em> and
 632 <em>maint</em> updates:</p>
 633 </li>
 634 <li>
 635 <p>Obviously correct fixes that pertain to the tip of <em>maint</em>
 636 are directly applied to <em>maint</em>.</p>
 637 </li>
 638 <li>
 639 <p>Obviously correct fixes that pertain to the tip of <em>master</em>
 640 are directly applied to <em>master</em>.</p>
 641 </li>
 642 <li>
 643 <p>Other topics are not handled in this step.</p>
 644 <div class="literalblock">
 645 <div class="content">
 646 <pre>This step is done with "git am".</pre>
 647 </div>
 648 </div>
 649 <div class="literalblock">
 650 <div class="content">
 651 <pre>$ git checkout master    ;# or "git checkout maint"
 652 $ git am -sc3 mailbox
 653 $ make test</pre>
 654 </div>
 655 </div>
 656 <div class="literalblock">
 657 <div class="content">
 658 <pre>In practice, almost no patch directly goes to 'master' or
 659 'maint'.</pre>
 660 </div>
 661 </div>
 662 </li>
 663 <li>
 664 <p>Review the last issue of "What&#8217;s cooking" message, review the
 665 topics ready for merging (topic&#8594;master and topic&#8594;maint).  Use
 666 "Meta/cook -w" script (where Meta/ contains a checkout of the
 667 <em>todo</em> branch) to aid this step.</p>
 668 <div class="literalblock">
 669 <div class="content">
 670 <pre>And perform the merge.  Use "Meta/Reintegrate -e" script (see
 671 later) to aid this step.</pre>
 672 </div>
 673 </div>
 674 <div class="literalblock">
 675 <div class="content">
 676 <pre>$ Meta/cook -w last-issue-of-whats-cooking.mbox</pre>
 677 </div>
 678 </div>
 679 <div class="literalblock">
 680 <div class="content">
 681 <pre>$ git checkout master    ;# or "git checkout maint"
 682 $ echo ai/topic | Meta/Reintegrate -e ;# "git merge ai/topic"
 683 $ git log -p ORIG_HEAD.. ;# final review
 684 $ git diff ORIG_HEAD..   ;# final review
 685 $ make test              ;# final review</pre>
 686 </div>
 687 </div>
 688 <div class="literalblock">
 689 <div class="content">
 690 <pre>If the tip of 'master' is updated, also generate the preformatted
 691 documentation and push the out result to git-htmldocs and
 692 git-manpages repositories.</pre>
 693 </div>
 694 </div>
 695 </li>
 696 <li>
 697 <p>Handle the remaining patches:</p>
 698 </li>
 699 <li>
 700 <p>Anything unobvious that is applicable to <em>master</em> (in other
 701 words, does not depend on anything that is still in <em>next</em>
 702 and not in <em>master</em>) is applied to a new topic branch that
 703 is forked from the tip of <em>master</em> (or the last feature release,
 704 which is a bit older than <em>master</em>).  This includes both
 705 enhancements and unobvious fixes to <em>master</em>.  A topic
 706 branch is named as ai/topic where "ai" is two-letter string
 707 named after author&#8217;s initial and "topic" is a descriptive name
 708 of the topic (in other words, "what&#8217;s the series is about").</p>
 709 </li>
 710 <li>
 711 <p>An unobvious fix meant for <em>maint</em> is applied to a new
 712 topic branch that is forked from the tip of <em>maint</em> (or the
 713 oldest and still relevant maintenance branch).  The
 714 topic may be named as ai/maint-topic.</p>
 715 </li>
 716 <li>
 717 <p>Changes that pertain to an existing topic are applied to
 718 the branch, but:</p>
 719 </li>
 720 <li>
 721 <p>obviously correct ones are applied first;</p>
 722 </li>
 723 <li>
 724 <p>questionable ones are discarded or applied to near the tip;</p>
 725 </li>
 726 <li>
 727 <p>Replacement patches to an existing topic are accepted only
 728 for commits not in <em>next</em>.</p>
 729 <div class="literalblock">
 730 <div class="content">
 731 <pre>The initial round is done with:</pre>
 732 </div>
 733 </div>
 734 <div class="literalblock">
 735 <div class="content">
 736 <pre>$ git checkout ai/topic ;# or "git checkout -b ai/topic master"
 737 $ git am -sc3 --whitespace=warn mailbox</pre>
 738 </div>
 739 </div>
 740 <div class="literalblock">
 741 <div class="content">
 742 <pre>and replacing an existing topic with subsequent round is done with:</pre>
 743 </div>
 744 </div>
 745 <div class="literalblock">
 746 <div class="content">
 747 <pre>$ git checkout master...ai/topic ;# try to reapply to the same base
 748 $ git am -sc3 --whitespace=warn mailbox</pre>
 749 </div>
 750 </div>
 751 <div class="literalblock">
 752 <div class="content">
 753 <pre>to prepare the new round on a detached HEAD, and then</pre>
 754 </div>
 755 </div>
 756 <div class="literalblock">
 757 <div class="content">
 758 <pre>$ git range-diff @{-1}...
 759 $ git diff @{-1}</pre>
 760 </div>
 761 </div>
 762 <div class="literalblock">
 763 <div class="content">
 764 <pre>to double check what changed since the last round, and finally</pre>
 765 </div>
 766 </div>
 767 <div class="literalblock">
 768 <div class="content">
 769 <pre>$ git checkout -B @{-1}</pre>
 770 </div>
 771 </div>
 772 <div class="literalblock">
 773 <div class="content">
 774 <pre>to conclude (the last step is why a topic already in 'next' is
 775 not replaced but updated incrementally).</pre>
 776 </div>
 777 </div>
 778 <div class="literalblock">
 779 <div class="content">
 780 <pre>Whether it is the initial round or a subsequent round, the topic
 781 may not build even in isolation, or may break the build when
 782 merged to integration branches due to bugs.  There may already
 783 be obvious and trivial improvements suggested on the list.  The
 784 maintainer often adds an extra commit, with "SQUASH???" in its
 785 title, to fix things up, before publishing the integration
 786 branches to make it usable by other developers for testing.
 787 These changes are what the maintainer is not 100% committed to
 788 (trivial typofixes etc. are often squashed directly into the
 789 patches that need fixing, without being applied as a separate
 790 "SQUASH???" commit), so that they can be removed easily as needed.
 791 The expectation is that the original author will make corrections
 792 in a reroll.</pre>
 793 </div>
 794 </div>
 795 </li>
 796 <li>
 797 <p>By now, new topic branches are created and existing topic
 798 branches are updated.  The integration branches <em>next</em>, <em>jch</em>,
 799 and <em>seen</em> need to be updated to contain them.</p>
 800 </li>
 801 <li>
 802 <p>If there are topics that have been merged to <em>master</em> and should
 803 be merged to <em>maint</em>, merge them to <em>maint</em>, and update the
 804 release notes to the next maintenance release.</p>
 805 </li>
 806 <li>
 807 <p>Review the latest issue of "What&#8217;s cooking" again.  Are topics
 808 that have been sufficiently long in <em>next</em> ready to be merged to
 809 <em>master</em>?  Are topics we saw earlier and are in <em>seen</em> now got
 810 positive reviews and are ready to be merged to <em>next</em>?</p>
 811 </li>
 812 <li>
 813 <p>If there are topics that have been cooking in <em>next</em> long enough
 814 and should be merged to <em>master</em>, merge them to <em>master</em>, and
 815 update the release notes to the next feature release.</p>
 816 </li>
 817 <li>
 818 <p>If there were patches directly made on <em>maint</em>, merge <em>maint</em> to
 819 <em>master</em>; make sure that the result is what you want.</p>
 820 <div class="literalblock">
 821 <div class="content">
 822 <pre>$ git checkout master
 823 $ git merge -m "Sync with 'maint'" --no-log maint
 824 $ git log -p --first-parent ORIG_HEAD..
 825 $ make test</pre>
 826 </div>
 827 </div>
 828 </li>
 829 <li>
 830 <p>Prepare to update the <em>jch</em> branch, which is used to represent
 831 somewhere between <em>master</em> and <em>seen</em> and often is slightly ahead
 832 of <em>next</em>, and the <em>seen</em> branch, which is used to hold the rest.</p>
 833 <div class="literalblock">
 834 <div class="content">
 835 <pre>$ Meta/Reintegrate master..jch &gt;Meta/redo-jch.sh</pre>
 836 </div>
 837 </div>
 838 <div class="literalblock">
 839 <div class="content">
 840 <pre>The result is a script that lists topics to be merged in order to
 841 rebuild the current 'jch'.  Do the same for 'seen'.</pre>
 842 </div>
 843 </div>
 844 </li>
 845 <li>
 846 <p>Review the Meta/redo-jch.sh and Meta/redo-seen.sh scripts.  The
 847 former should have a line <em><mark>#</mark> match next</em>---the idea is that
 848 merging the topics listed before the line on top of <em>master</em>
 849 should result in a tree identical to that of <em>next</em>.</p>
 850 </li>
 851 <li>
 852 <p>As newly created topics are usually merged near the tip of
 853 <em>seen</em>, add them to the end of the Meta/redo-seen.sh script.
 854 Among the topics that were in <em>seen</em>, there may be ones that
 855 are not quite ready for <em>next</em> but are getting there.  Move
 856 them from Meta/redo-seen.sh to the end of Meta/redo-jch.sh.
 857 The expectation is that you&#8217;d use <em>jch</em> as your daily driver
 858 as the first guinea pig, so you should choose carefully.</p>
 859 </li>
 860 <li>
 861 <p>Now we are ready to start rebuilding <em>jch</em> and merging topics to
 862 <em>next</em>.  For each branch whose tip is not merged to <em>next</em>, one
 863 of three things can happen:</p>
 864 </li>
 865 <li>
 866 <p>The commits are all next-worthy; merge the topic to next;</p>
 867 </li>
 868 <li>
 869 <p>The new parts are of mixed quality, but earlier ones are
 870 next-worthy; merge the early parts to next;</p>
 871 </li>
 872 <li>
 873 <p>Nothing is next-worthy; do not do anything.</p>
 874 <div class="literalblock">
 875 <div class="content">
 876 <pre>This step is aided with Meta/redo-jch.sh script created earlier.
 877 If a topic that was already in 'next' gained a patch, the script
 878 would list it as "ai/topic~1".  To include the new patch to the
 879 updated 'next', drop the "~1" part; to keep it excluded, do not
 880 touch the line.</pre>
 881 </div>
 882 </div>
 883 <div class="literalblock">
 884 <div class="content">
 885 <pre>If a topic that was not in 'next' should be merged to 'next', add
 886 it before the '### match next' line.  Then:</pre>
 887 </div>
 888 </div>
 889 <div class="literalblock">
 890 <div class="content">
 891 <pre>$ git checkout --detach master
 892 $ sh Meta/redo-jch.sh -c1</pre>
 893 </div>
 894 </div>
 895 <div class="literalblock">
 896 <div class="content">
 897 <pre>to rebuild the 'jch' branch from scratch.  "-c1" tells the script
 898 to stop merging at the first line that begins with '###'
 899 (i.e. the "### match next" line you added earlier).</pre>
 900 </div>
 901 </div>
 902 <div class="literalblock">
 903 <div class="content">
 904 <pre>At this point, build-test the result.  It may reveal semantic
 905 conflicts (e.g. a topic renamed a variable, another added a new
 906 reference to the variable under its old name), in which case
 907 prepare an appropriate merge-fix first (see appendix), and
 908 rebuild the 'jch' branch from scratch, starting at the tip of
 909 'master', this time without using "-c1" to merge all topics.</pre>
 910 </div>
 911 </div>
 912 <div class="literalblock">
 913 <div class="content">
 914 <pre>Then do the same to 'next'.</pre>
 915 </div>
 916 </div>
 917 <div class="literalblock">
 918 <div class="content">
 919 <pre>$ git checkout next
 920 $ sh Meta/redo-jch.sh -c1 -e</pre>
 921 </div>
 922 </div>
 923 <div class="literalblock">
 924 <div class="content">
 925 <pre>The "-e" option allows the merge message that comes from the
 926 history of the topic and the comments in the "What's cooking" to
 927 be edited.  The resulting tree should match 'jch^{/^### match next'}'
 928 as the same set of topics are merged on 'master'; otherwise there
 929 is a mismerge. Investigate why and do not proceed until the mismerge
 930 is found and rectified.</pre>
 931 </div>
 932 </div>
 933 <div class="literalblock">
 934 <div class="content">
 935 <pre>If 'master' was updated before you started redoing 'next', then</pre>
 936 </div>
 937 </div>
 938 <div class="literalblock">
 939 <div class="content">
 940 <pre>$ git diff 'jch^{/^### match next}' next</pre>
 941 </div>
 942 </div>
 943 <div class="literalblock">
 944 <div class="content">
 945 <pre>would show differences that went into 'master' (which 'jch' has,
 946 but 'next' does not yet---often it is updates to the release
 947 notes).  Merge 'master' back to 'next' if that is the case.</pre>
 948 </div>
 949 </div>
 950 <div class="literalblock">
 951 <div class="content">
 952 <pre>$ git merge -m "Sync with 'master'" --no-log master</pre>
 953 </div>
 954 </div>
 955 <div class="literalblock">
 956 <div class="content">
 957 <pre>When all is well, clean up the redo-jch.sh script with</pre>
 958 </div>
 959 </div>
 960 <div class="literalblock">
 961 <div class="content">
 962 <pre>$ sh Meta/redo-jch.sh -u</pre>
 963 </div>
 964 </div>
 965 <div class="literalblock">
 966 <div class="content">
 967 <pre>This removes topics listed in the script that have already been
 968 merged to 'master'.  This may lose '### match next' marker;
 969 add it again to the appropriate place when it happens.</pre>
 970 </div>
 971 </div>
 972 </li>
 973 <li>
 974 <p>Rebuild <em>seen</em> on top of <em>jch</em>.</p>
 975 <div class="literalblock">
 976 <div class="content">
 977 <pre>$ git checkout -B seen jch
 978 $ sh Meta/redo-seen.sh</pre>
 979 </div>
 980 </div>
 981 <div class="literalblock">
 982 <div class="content">
 983 <pre>When all is well, clean up the redo-seen.sh script with</pre>
 984 </div>
 985 </div>
 986 <div class="literalblock">
 987 <div class="content">
 988 <pre>$ sh Meta/redo-seen.sh -u</pre>
 989 </div>
 990 </div>
 991 <div class="literalblock">
 992 <div class="content">
 993 <pre>Double check by running</pre>
 994 </div>
 995 </div>
 996 <div class="literalblock">
 997 <div class="content">
 998 <pre>$ git branch --no-merged seen '??/*'</pre>
 999 </div>
1000 </div>
1001 <div class="literalblock">
1002 <div class="content">
1003 <pre>to see there is no unexpected leftover topics.</pre>
1004 </div>
1005 </div>
1006 <div class="literalblock">
1007 <div class="content">
1008 <pre>At this point, build-test the result for semantic conflicts, and
1009 if there are, prepare an appropriate merge-fix first (see
1010 appendix), and rebuild the 'seen' branch from scratch, starting at
1011 the tip of 'jch'.</pre>
1012 </div>
1013 </div>
1014 </li>
1015 <li>
1016 <p>Update "What&#8217;s cooking" message to review the updates to
1017 existing topics, newly added topics and graduated topics.</p>
1018 <div class="literalblock">
1019 <div class="content">
1020 <pre>This step is helped with Meta/cook script.</pre>
1021 </div>
1022 </div>
1023 <div class="literalblock">
1024 <div class="content">
1025 <pre>$ Meta/cook</pre>
1026 </div>
1027 </div>
1028 <div class="literalblock">
1029 <div class="content">
1030 <pre>This script inspects the history between master..seen, finds tips
1031 of topic branches, compares what it found with the current
1032 contents in Meta/whats-cooking.txt, and updates that file.
1033 Topics not listed in the file but are found in master..seen are
1034 added to the "New topics" section, topics listed in the file that
1035 are no longer found in master..seen are moved to the "Graduated to
1036 master" section, and topics whose commits changed their states
1037 (e.g. used to be only in 'seen', now merged to 'next') are updated
1038 with change markers "&lt;&lt;" and "&gt;&gt;".</pre>
1039 </div>
1040 </div>
1041 <div class="literalblock">
1042 <div class="content">
1043 <pre>Look for lines enclosed in "&lt;&lt;" and "&gt;&gt;"; they hold contents from
1044 old file that are replaced by this integration round.  After
1045 verifying them, remove the old part.  Review the description for
1046 each topic and update its doneness and plan as needed.  To review
1047 the updated plan, run</pre>
1048 </div>
1049 </div>
1050 <div class="literalblock">
1051 <div class="content">
1052 <pre>$ Meta/cook -w</pre>
1053 </div>
1054 </div>
1055 <div class="literalblock">
1056 <div class="content">
1057 <pre>which will pick up comments given to the topics, such as "Will
1058 merge to 'next'", etc. (see Meta/cook script to learn what kind
1059 of phrases are supported).</pre>
1060 </div>
1061 </div>
1062 </li>
1063 <li>
1064 <p>Compile, test and install all four (five) integration branches;
1065 Meta/Dothem script may aid this step.</p>
1066 </li>
1067 <li>
1068 <p>Format documentation if the <em>master</em> branch was updated;
1069 Meta/dodoc.sh script may aid this step.</p>
1070 </li>
1071 <li>
1072 <p>Push the integration branches out to public places; Meta/pushall
1073 script may aid this step.</p>
1074 </li>
1075 </ul>
1076 </div>
1077 </div>
1078 </div>
1079 <div class="sect1">
1080 <h2 id="_observations">Observations</h2>
1081 <div class="sectionbody">
1082 <div class="paragraph">
1083 <p>Some observations to be made.</p>
1084 </div>
1085 <div class="ulist">
1086 <ul>
1087 <li>
1088 <p>Each topic is tested individually, and also together with other
1089 topics cooking first in <em>seen</em>, then in <em>jch</em> and then in <em>next</em>.
1090 Until it matures, no part of it is merged to <em>master</em>.</p>
1091 </li>
1092 <li>
1093 <p>A topic already in <em>next</em> can get fixes while still in
1094 <em>next</em>.  Such a topic will have many merges to <em>next</em> (in
1095 other words, "git log --first-parent next" will show many
1096 "Merge branch <em>ai/topic</em> to next" for the same topic.</p>
1097 </li>
1098 <li>
1099 <p>An unobvious fix for <em>maint</em> is cooked in <em>next</em> and then
1100 merged to <em>master</em> to make extra sure it is Ok and then
1101 merged to <em>maint</em>.</p>
1102 </li>
1103 <li>
1104 <p>Even when <em>next</em> becomes empty (in other words, all topics
1105 prove stable and are merged to <em>master</em> and "git diff master
1106 next" shows empty), it has tons of merge commits that will
1107 never be in <em>master</em>.</p>
1108 </li>
1109 <li>
1110 <p>In principle, "git log --first-parent master..next" should
1111 show nothing but merges (in practice, there are fixup commits
1112 and reverts that are not merges).</p>
1113 </li>
1114 <li>
1115 <p>Commits near the tip of a topic branch that are not in <em>next</em>
1116 are fair game to be discarded, replaced or rewritten.
1117 Commits already merged to <em>next</em> will not be.</p>
1118 </li>
1119 <li>
1120 <p>Being in the <em>next</em> branch is not a guarantee for a topic to
1121 be included in the next feature release.  Being in the
1122 <em>master</em> branch typically is.</p>
1123 </li>
1124 <li>
1125 <p>Due to the nature of "SQUASH???" fix-ups, if the original author
1126 agrees with the suggested changes, it is OK to squash them to
1127 appropriate patches in the next round (when the suggested change
1128 is small enough, the author should not even bother with
1129 "Helped-by").  It is also OK to drop them from the next round
1130 when the original author does not agree with the suggestion, but
1131 the author is expected to say why somewhere in the discussion.</p>
1132 </li>
1133 </ul>
1134 </div>
1135 </div>
1136 </div>
1137 <div class="sect1">
1138 <h2 id="_appendix">Appendix</h2>
1139 <div class="sectionbody">
1140 <div class="sect2">
1141 <h3 id="_preparing_a_merge_fix">Preparing a "merge-fix"</h3>
1142 <div class="paragraph">
1143 <p>A merge of two topics may not textually conflict but still have
1144 conflict at the semantic level. A classic example is for one topic
1145 to rename a variable and all its uses, while another topic adds a
1146 new use of the variable under its old name. When these two topics
1147 are merged together, the reference to the variable newly added by
1148 the latter topic will still use the old name in the result.</p>
1149 </div>
1150 <div class="paragraph">
1151 <p>The Meta/Reintegrate script that is used by redo-jch and redo-seen
1152 scripts implements a crude but usable way to work around this issue.
1153 When the script merges branch $X, it checks if "refs/merge-fix/$X"
1154 exists, and if so, the effect of it is squashed into the result of
1155 the mechanical merge.  In other words,</p>
1156 </div>
1157 <div class="literalblock">
1158 <div class="content">
1159 <pre>$ echo $X | Meta/Reintegrate</pre>
1160 </div>
1161 </div>
1162 <div class="paragraph">
1163 <p>is roughly equivalent to this sequence:</p>
1164 </div>
1165 <div class="literalblock">
1166 <div class="content">
1167 <pre>$ git merge --rerere-autoupdate $X
1168 $ git commit
1169 $ git cherry-pick -n refs/merge-fix/$X
1170 $ git commit --amend</pre>
1171 </div>
1172 </div>
1173 <div class="paragraph">
1174 <p>The goal of this "prepare a merge-fix" step is to come up with a
1175 commit that can be squashed into a result of mechanical merge to
1176 correct semantic conflicts.</p>
1177 </div>
1178 <div class="paragraph">
1179 <p>After finding that the result of merging branch "ai/topic" to an
1180 integration branch had such a semantic conflict, say seen~4, check the
1181 problematic merge out on a detached HEAD, edit the working tree to
1182 fix the semantic conflict, and make a separate commit to record the
1183 fix-up:</p>
1184 </div>
1185 <div class="literalblock">
1186 <div class="content">
1187 <pre>$ git checkout seen~4
1188 $ git show -s --pretty=%s ;# double check
1189 Merge branch 'ai/topic' to seen
1190 $ edit
1191 $ git commit -m 'merge-fix/ai/topic' -a</pre>
1192 </div>
1193 </div>
1194 <div class="paragraph">
1195 <p>Then make a reference "refs/merge-fix/ai/topic" to point at this
1196 result:</p>
1197 </div>
1198 <div class="literalblock">
1199 <div class="content">
1200 <pre>$ git update-ref refs/merge-fix/ai/topic HEAD</pre>
1201 </div>
1202 </div>
1203 <div class="paragraph">
1204 <p>Then double check the result by asking Meta/Reintegrate to redo the
1205 merge:</p>
1206 </div>
1207 <div class="literalblock">
1208 <div class="content">
1209 <pre>$ git checkout seen~5 ;# the parent of the problem merge
1210 $ echo ai/topic | Meta/Reintegrate
1211 $ git diff seen~4</pre>
1212 </div>
1213 </div>
1214 <div class="paragraph">
1215 <p>This time, because you prepared refs/merge-fix/ai/topic, the
1216 resulting merge should have been tweaked to include the fix for the
1217 semantic conflict.</p>
1218 </div>
1219 <div class="paragraph">
1220 <p>Note that this assumes that the order in which conflicting branches
1221 are merged does not change.  If the reason why merging ai/topic
1222 branch needs this merge-fix is because another branch merged earlier
1223 to the integration branch changed the underlying assumption ai/topic
1224 branch made (e.g. ai/topic branch added a site to refer to a
1225 variable, while the other branch renamed that variable and adjusted
1226 existing use sites), and if you changed redo-jch (or redo-seen) script
1227 to merge ai/topic branch before the other branch, then the above
1228 merge-fix should not be applied while merging ai/topic, but should
1229 instead be applied while merging the other branch.  You would need
1230 to move the fix to apply to the other branch, perhaps like this:</p>
1231 </div>
1232 <div class="literalblock">
1233 <div class="content">
1234 <pre>$ mf=refs/merge-fix
1235 $ git update-ref $mf/$the_other_branch $mf/ai/topic
1236 $ git update-ref -d $mf/ai/topic</pre>
1237 </div>
1238 </div>
1239 </div>
1240 </div>
1241 </div>
1242 </div>
1243 <div id="footer">
1244 <div id="footer-text">
1245 Last updated 2024-09-10 13:23:33 -0700
1246 </div>
1247 </div>
1248 </body>
1249 </html>