Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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" /> |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 6 | <meta name="generator" content="AsciiDoc 8.5.2" /> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 7 | <title>git-branch(1)</title> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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 | |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 20 | a { |
| 21 | color: blue; |
| 22 | text-decoration: underline; |
| 23 | } |
| 24 | a:visited { |
| 25 | color: fuchsia; |
| 26 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 27 | |
| 28 | em { |
| 29 | font-style: italic; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 30 | color: navy; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 31 | } |
| 32 | |
| 33 | strong { |
| 34 | font-weight: bold; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 35 | color: #083194; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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 | |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 50 | h1, h2, h3 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 51 | border-bottom: 2px solid silver; |
| 52 | } |
| 53 | h2 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 54 | padding-top: 0.5em; |
| 55 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 56 | h3 { |
| 57 | float: left; |
| 58 | } |
| 59 | h3 + * { |
| 60 | clear: left; |
| 61 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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 | |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 77 | ul, ol, li > p { |
| 78 | margin-top: 0; |
| 79 | } |
| 80 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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; |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 90 | font-size: 1.1em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 91 | } |
| 92 | span#email { |
| 93 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 94 | span#revnumber, span#revdate, span#revremark { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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 | |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 114 | div#preamble { |
| 115 | margin-top: 1.5em; |
| 116 | margin-bottom: 1.5em; |
| 117 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 118 | div.tableblock, div.imageblock, div.exampleblock, div.verseblock, |
| 119 | div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, |
| 120 | div.admonitionblock { |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 121 | margin-top: 1.0em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 122 | margin-bottom: 1.5em; |
| 123 | } |
| 124 | div.admonitionblock { |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 125 | margin-top: 2.0em; |
| 126 | margin-bottom: 2.0em; |
| 127 | margin-right: 10%; |
| 128 | color: #606060; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 129 | } |
| 130 | |
| 131 | div.content { /* Block element content. */ |
| 132 | padding: 0; |
| 133 | } |
| 134 | |
| 135 | /* Block element titles. */ |
| 136 | div.title, caption.title { |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 137 | color: #527bbd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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 | |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 170 | div.quoteblock, div.verseblock { |
| 171 | padding-left: 1.0em; |
| 172 | margin-left: 1.0em; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 173 | margin-right: 10%; |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 174 | border-left: 5px solid #dddddd; |
| 175 | color: #777777; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 176 | } |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 177 | |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 178 | div.quoteblock > div.attribution { |
| 179 | padding-top: 0.5em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 180 | text-align: right; |
| 181 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 182 | |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 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. */ |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 191 | div.verseblock + div.attribution { |
| 192 | text-align: left; |
| 193 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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; |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 205 | border-left: 3px solid #dddddd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 206 | } |
| 207 | |
| 208 | div.exampleblock > div.content { |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 209 | border-left: 3px solid #dddddd; |
| 210 | padding-left: 0.5em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 211 | } |
| 212 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 213 | div.imageblock div.content { padding-left: 0; } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 214 | span.image img { border-style: none; } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 215 | a.image:visited { color: white; } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 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; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 224 | font-style: normal; |
| 225 | color: navy; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 226 | } |
| 227 | dd > *:first-child { |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 228 | margin-top: 0.1em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 229 | } |
| 230 | |
| 231 | ul, ol { |
| 232 | list-style-position: outside; |
| 233 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 234 | ol.arabic { |
| 235 | list-style-type: decimal; |
| 236 | } |
| 237 | ol.loweralpha { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 238 | list-style-type: lower-alpha; |
| 239 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 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 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 256 | |
| 257 | div.tableblock > table { |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 258 | border: 3px solid #527bbd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 259 | } |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 260 | thead, p.table.header { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 261 | font-family: sans-serif; |
| 262 | font-weight: bold; |
| 263 | } |
| 264 | tfoot { |
| 265 | font-weight: bold; |
| 266 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 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 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 285 | |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 286 | |
| 287 | div.hdlist { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 288 | margin-top: 0.8em; |
| 289 | margin-bottom: 0.8em; |
| 290 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 291 | div.hdlist tr { |
| 292 | padding-bottom: 15px; |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 293 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 294 | dt.hdlist1.strong, td.hdlist1.strong { |
| 295 | font-weight: bold; |
| 296 | } |
| 297 | td.hdlist1 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 298 | vertical-align: top; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 299 | font-style: normal; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 300 | padding-right: 0.8em; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 301 | color: navy; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 302 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 303 | td.hdlist2 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 304 | vertical-align: top; |
| 305 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 306 | div.hdlist.compact tr { |
| 307 | margin: 0; |
| 308 | padding-bottom: 0; |
| 309 | } |
| 310 | |
| 311 | .comment { |
| 312 | background: yellow; |
| 313 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 314 | |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 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 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 343 | @media print { |
| 344 | div#footer-badges { display: none; } |
| 345 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 346 | |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 347 | div#toc { |
| 348 | margin-bottom: 2.5em; |
| 349 | } |
| 350 | |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 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 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 376 | /* Overrides for manpage documents */ |
| 377 | h1 { |
| 378 | padding-top: 0.5em; |
| 379 | padding-bottom: 0.5em; |
| 380 | border-top: 2px solid silver; |
| 381 | border-bottom: 2px solid silver; |
| 382 | } |
| 383 | h2 { |
| 384 | border-style: none; |
| 385 | } |
| 386 | div.sectionbody { |
| 387 | margin-left: 5%; |
| 388 | } |
| 389 | |
| 390 | @media print { |
| 391 | div#toc { display: none; } |
| 392 | } |
| 393 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 394 | /* Workarounds for IE6's broken and incomplete CSS2. */ |
| 395 | |
| 396 | div.sidebar-content { |
| 397 | background: #ffffee; |
| 398 | border: 1px solid silver; |
| 399 | padding: 0.5em; |
| 400 | } |
| 401 | div.sidebar-title, div.image-title { |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 402 | color: #527bbd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 403 | font-family: sans-serif; |
| 404 | font-weight: bold; |
| 405 | margin-top: 0.0em; |
| 406 | margin-bottom: 0.5em; |
| 407 | } |
| 408 | |
| 409 | div.listingblock div.content { |
| 410 | border: 1px solid silver; |
| 411 | background: #f4f4f4; |
| 412 | padding: 0.5em; |
| 413 | } |
| 414 | |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 415 | div.quoteblock-attribution { |
| 416 | padding-top: 0.5em; |
| 417 | text-align: right; |
| 418 | } |
| 419 | |
| 420 | div.verseblock-content { |
| 421 | white-space: pre; |
| 422 | } |
| 423 | div.verseblock-attribution { |
| 424 | padding-top: 0.75em; |
| 425 | text-align: left; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 426 | } |
| 427 | |
| 428 | div.exampleblock-content { |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 429 | border-left: 3px solid #dddddd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 430 | padding-left: 0.5em; |
| 431 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 432 | |
| 433 | /* IE6 sets dynamically generated links as visited. */ |
| 434 | div#toc a:visited { color: blue; } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 435 | </style> |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 436 | <script type="text/javascript"> |
| 437 | /*<+'])'); |
| 481 | // Function that scans the DOM tree for header elements (the DOM2 |
| 482 | // nodeIterator API would be a better technique but not supported by all |
| 483 | // browsers). |
| 484 | var iterate = function (el) { |
| 485 | for (var i = el.firstChild; i != null; i = i.nextSibling) { |
| 486 | if (i.nodeType == 1 /* Node.ELEMENT_NODE */) { |
| 487 | var mo = re.exec(i.tagName); |
| 488 | if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") { |
| 489 | result[result.length] = new TocEntry(i, getText(i), mo[1]-1); |
| 490 | } |
| 491 | iterate(i); |
| 492 | } |
| 493 | } |
| 494 | } |
| 495 | iterate(el); |
| 496 | return result; |
| 497 | } |
| 498 | |
| 499 | var toc = document.getElementById("toc"); |
| 500 | var entries = tocEntries(document.getElementById("content"), toclevels); |
| 501 | for (var i = 0; i < entries.length; ++i) { |
| 502 | var entry = entries[i]; |
| 503 | if (entry.element.id == "") |
| 504 | entry.element.id = "_toc_" + i; |
| 505 | var a = document.createElement("a"); |
| 506 | a.href = "#" + entry.element.id; |
| 507 | a.appendChild(document.createTextNode(entry.text)); |
| 508 | var div = document.createElement("div"); |
| 509 | div.appendChild(a); |
| 510 | div.className = "toclevel" + entry.toclevel; |
| 511 | toc.appendChild(div); |
| 512 | } |
| 513 | if (entries.length == 0) |
| 514 | toc.parentNode.removeChild(toc); |
| 515 | }, |
| 516 | |
| 517 | |
| 518 | ///////////////////////////////////////////////////////////////////// |
| 519 | // Footnotes generator |
| 520 | ///////////////////////////////////////////////////////////////////// |
| 521 | |
| 522 | /* Based on footnote generation code from: |
| 523 | * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html |
| 524 | */ |
| 525 | |
| 526 | footnotes: function () { |
| 527 | var cont = document.getElementById("content"); |
| 528 | var noteholder = document.getElementById("footnotes"); |
| 529 | var spans = cont.getElementsByTagName("span"); |
| 530 | var refs = {}; |
| 531 | var n = 0; |
| 532 | for (i=0; i<spans.length; i++) { |
| 533 | if (spans[i].className == "footnote") { |
| 534 | n++; |
| 535 | // Use [\s\S] in place of . so multi-line matches work. |
| 536 | // Because JavaScript has no s (dotall) regex flag. |
| 537 | note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1]; |
| 538 | noteholder.innerHTML += |
| 539 | "<div class='footnote' id='_footnote_" + n + "'>" + |
| 540 | "<a href='#_footnoteref_" + n + "' title='Return to text'>" + |
| 541 | n + "</a>. " + note + "</div>"; |
| 542 | spans[i].innerHTML = |
| 543 | "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n + |
| 544 | "' title='View footnote' class='footnote'>" + n + "</a>]"; |
| 545 | var id =spans[i].getAttribute("id"); |
| 546 | if (id != null) refs["#"+id] = n; |
| 547 | } |
| 548 | } |
| 549 | if (n == 0) |
| 550 | noteholder.parentNode.removeChild(noteholder); |
| 551 | else { |
| 552 | // Process footnoterefs. |
| 553 | for (i=0; i<spans.length; i++) { |
| 554 | if (spans[i].className == "footnoteref") { |
| 555 | var href = spans[i].getElementsByTagName("a")[0].getAttribute("href"); |
| 556 | href = href.match(/#.*/)[0]; // Because IE return full URL. |
| 557 | n = refs[href]; |
| 558 | spans[i].innerHTML = |
| 559 | "[<a href='#_footnote_" + n + |
| 560 | "' title='View footnote' class='footnote'>" + n + "</a>]"; |
| 561 | } |
| 562 | } |
| 563 | } |
| 564 | } |
| 565 | |
| 566 | } |
| 567 | /*]]>*/ |
| 568 | </script> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 569 | </head> |
| 570 | <body> |
| 571 | <div id="header"> |
| 572 | <h1> |
| 573 | git-branch(1) Manual Page |
| 574 | </h1> |
| 575 | <h2>NAME</h2> |
| 576 | <div class="sectionbody"> |
| 577 | <p>git-branch - |
Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 578 | List, create, or delete branches |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 579 | </p> |
| 580 | </div> |
| 581 | </div> |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 582 | <div id="content"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 583 | <h2 id="_synopsis">SYNOPSIS</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 584 | <div class="sectionbody"> |
Junio C Hamano | 2b13527 | 2006-03-18 07:45:42 | [diff] [blame] | 585 | <div class="verseblock"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 586 | <div class="verseblock-content"><em>git branch</em> [--color[=<when>] | --no-color] [-r | -a] |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 587 | [--list] [-v [--abbrev=<length> | --no-abbrev]] |
Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 588 | [--column[=<options>] | --no-column] |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 589 | [(--merged | --no-merged | --contains) [<commit>]] [<pattern>…] |
Junio C Hamano | 57827fb | 2010-01-23 03:02:50 | [diff] [blame] | 590 | <em>git branch</em> [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>] |
Junio C Hamano | eccdd4a | 2012-09-10 23:28:17 | [diff] [blame] | 591 | <em>git branch</em> (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>] |
| 592 | <em>git branch</em> --unset-upstream [<branchname>] |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 593 | <em>git branch</em> (-m | -M) [<oldbranch>] <newbranch> |
Junio C Hamano | 515ab1d | 2011-12-09 23:41:20 | [diff] [blame] | 594 | <em>git branch</em> (-d | -D) [-r] <branchname>… |
| 595 | <em>git branch</em> --edit-description [<branchname>]</div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 596 | <div class="verseblock-attribution"> |
| 597 | </div></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 598 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 599 | <h2 id="_description">DESCRIPTION</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 600 | <div class="sectionbody"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 601 | <div class="paragraph"><p>With no arguments, existing branches are listed and the current branch will |
Junio C Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 602 | be highlighted with an asterisk. Option <tt>-r</tt> causes the remote-tracking |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 603 | branches to be listed, and option <tt>-a</tt> shows both. This list mode is also |
| 604 | activated by the <tt>--list</tt> option (see below). |
| 605 | <pattern> restricts the output to matching branches, the pattern is a shell |
Junio C Hamano | cae88e2 | 2012-03-09 00:13:20 | [diff] [blame] | 606 | wildcard (i.e., matched using fnmatch(3)). |
| 607 | Multiple patterns may be given; if any of them matches, the branch is shown.</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 608 | <div class="paragraph"><p>With <tt>--contains</tt>, shows only the branches that contain the named commit |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 609 | (in other words, the branches whose tip commits are descendants of the |
Junio C Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 610 | named commit). With <tt>--merged</tt>, only branches merged into the named |
| 611 | commit (i.e. the branches whose tip commits are reachable from the named |
| 612 | commit) will be listed. With <tt>--no-merged</tt> only branches not merged into |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 613 | the named commit will be listed. If the <commit> argument is missing it |
| 614 | defaults to <em>HEAD</em> (i.e. the tip of the current branch).</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 615 | <div class="paragraph"><p>The command’s second form creates a new branch head named <branchname> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 616 | which points to the current <em>HEAD</em>, or <start-point> if given.</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 617 | <div class="paragraph"><p>Note that this will create the new branch, but it will not switch the |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 618 | working tree to it; use "git checkout <newbranch>" to switch to the |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 619 | new branch.</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 620 | <div class="paragraph"><p>When a local branch is started off a remote-tracking branch, git sets up the |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 621 | branch so that <em>git pull</em> will appropriately merge from |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 622 | the remote-tracking branch. This behavior may be changed via the global |
Junio C Hamano | 24bc09a | 2008-02-28 00:27:44 | [diff] [blame] | 623 | <tt>branch.autosetupmerge</tt> configuration flag. That setting can be |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 624 | overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options, and |
Junio C Hamano | eccdd4a | 2012-09-10 23:28:17 | [diff] [blame] | 625 | changed later using <tt>git branch --set-upstream-to</tt>.</p></div> |
Junio C Hamano | cae88e2 | 2012-03-09 00:13:20 | [diff] [blame] | 626 | <div class="paragraph"><p>With a <tt>-m</tt> or <tt>-M</tt> option, <oldbranch> will be renamed to <newbranch>. |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 627 | If <oldbranch> had a corresponding reflog, it is renamed to match |
| 628 | <newbranch>, and a reflog entry is created to remember the branch |
| 629 | renaming. If <newbranch> exists, -M must be used to force the rename |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 630 | to happen.</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 631 | <div class="paragraph"><p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt><branchname></tt> will be deleted. You may |
Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 632 | specify more than one branch for deletion. If the branch currently |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 633 | has a reflog then the reflog will also be deleted.</p></div> |
Junio C Hamano | cae88e2 | 2012-03-09 00:13:20 | [diff] [blame] | 634 | <div class="paragraph"><p>Use <tt>-r</tt> together with <tt>-d</tt> to delete remote-tracking branches. Note, that it |
Junio C Hamano | 258e441 | 2007-11-29 02:28:32 | [diff] [blame] | 635 | only makes sense to delete remote-tracking branches if they no longer exist |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 636 | in the remote repository or if <em>git fetch</em> was configured not to fetch |
Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 637 | them again. See also the <em>prune</em> subcommand of <a href="git-remote.html">git-remote(1)</a> for a |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 638 | way to clean up all obsolete remote-tracking branches.</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 639 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 640 | <h2 id="_options">OPTIONS</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 641 | <div class="sectionbody"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 642 | <div class="dlist"><dl> |
| 643 | <dt class="hdlist1"> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 644 | -d |
| 645 | </dt> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 646 | <dt class="hdlist1"> |
| 647 | --delete |
| 648 | </dt> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 649 | <dd> |
| 650 | <p> |
Junio C Hamano | d965706 | 2010-04-18 00:01:03 | [diff] [blame] | 651 | Delete a branch. The branch must be fully merged in its |
| 652 | upstream branch, or in <tt>HEAD</tt> if no upstream was set with |
| 653 | <tt>--track</tt> or <tt>--set-upstream</tt>. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 654 | </p> |
| 655 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 656 | <dt class="hdlist1"> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 657 | -D |
| 658 | </dt> |
| 659 | <dd> |
| 660 | <p> |
Junio C Hamano | 258e441 | 2007-11-29 02:28:32 | [diff] [blame] | 661 | Delete a branch irrespective of its merged status. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 662 | </p> |
| 663 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 664 | <dt class="hdlist1"> |
Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 665 | -l |
| 666 | </dt> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 667 | <dt class="hdlist1"> |
| 668 | --create-reflog |
| 669 | </dt> |
Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 670 | <dd> |
| 671 | <p> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 672 | Create the branch’s reflog. This activates recording of |
Junio C Hamano | 1d90cb0 | 2007-07-03 07:05:31 | [diff] [blame] | 673 | all changes made to the branch ref, enabling use of date |
| 674 | based sha1 expressions such as "<branchname>@{yesterday}". |
Junio C Hamano | e749562 | 2010-04-09 07:18:35 | [diff] [blame] | 675 | Note that in non-bare repositories, reflogs are usually |
| 676 | enabled by default by the <tt>core.logallrefupdates</tt> config option. |
Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 677 | </p> |
| 678 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 679 | <dt class="hdlist1"> |
Junio C Hamano | 560a1f6 | 2006-01-30 04:19:57 | [diff] [blame] | 680 | -f |
| 681 | </dt> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 682 | <dt class="hdlist1"> |
Junio C Hamano | 68cfa3a | 2009-08-30 00:22:55 | [diff] [blame] | 683 | --force |
| 684 | </dt> |
Junio C Hamano | 560a1f6 | 2006-01-30 04:19:57 | [diff] [blame] | 685 | <dd> |
| 686 | <p> |
Junio C Hamano | ea82cff | 2009-03-18 01:54:48 | [diff] [blame] | 687 | Reset <branchname> to <startpoint> if <branchname> exists |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 688 | already. Without <tt>-f</tt> <em>git branch</em> refuses to change an existing branch. |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 689 | </p> |
| 690 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 691 | <dt class="hdlist1"> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 692 | -m |
| 693 | </dt> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 694 | <dt class="hdlist1"> |
| 695 | --move |
| 696 | </dt> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 697 | <dd> |
| 698 | <p> |
| 699 | Move/rename a branch and the corresponding reflog. |
| 700 | </p> |
| 701 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 702 | <dt class="hdlist1"> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 703 | -M |
| 704 | </dt> |
| 705 | <dd> |
| 706 | <p> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 707 | Move/rename a branch even if the new branch name already exists. |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 708 | </p> |
| 709 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 710 | <dt class="hdlist1"> |
Junio C Hamano | 4aa0bcc | 2010-03-03 05:13:12 | [diff] [blame] | 711 | --color[=<when>] |
Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 712 | </dt> |
| 713 | <dd> |
| 714 | <p> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 715 | Color branches to highlight current, local, and |
| 716 | remote-tracking branches. |
Junio C Hamano | 4aa0bcc | 2010-03-03 05:13:12 | [diff] [blame] | 717 | The value must be always (the default), never, or auto. |
Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 718 | </p> |
| 719 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 720 | <dt class="hdlist1"> |
Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 721 | --no-color |
| 722 | </dt> |
| 723 | <dd> |
| 724 | <p> |
| 725 | Turn off branch colors, even when the configuration file gives the |
| 726 | default to color output. |
Junio C Hamano | 4aa0bcc | 2010-03-03 05:13:12 | [diff] [blame] | 727 | Same as <tt>--color=never</tt>. |
Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 728 | </p> |
| 729 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 730 | <dt class="hdlist1"> |
Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 731 | --column[=<options>] |
| 732 | </dt> |
| 733 | <dt class="hdlist1"> |
| 734 | --no-column |
| 735 | </dt> |
| 736 | <dd> |
| 737 | <p> |
| 738 | Display branch listing in columns. See configuration variable |
| 739 | column.branch for option syntax.<tt>--column</tt> and <tt>--no-column</tt> |
| 740 | without options are equivalent to <em>always</em> and <em>never</em> respectively. |
| 741 | </p> |
| 742 | <div class="paragraph"><p>This option is only applicable in non-verbose mode.</p></div> |
| 743 | </dd> |
| 744 | <dt class="hdlist1"> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 745 | -r |
| 746 | </dt> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 747 | <dt class="hdlist1"> |
| 748 | --remotes |
| 749 | </dt> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 750 | <dd> |
| 751 | <p> |
Junio C Hamano | 63ef0ac | 2006-12-22 07:28:18 | [diff] [blame] | 752 | List or delete (if used with -d) the remote-tracking branches. |
Junio C Hamano | fe9acab | 2006-11-24 12:10:55 | [diff] [blame] | 753 | </p> |
| 754 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 755 | <dt class="hdlist1"> |
Junio C Hamano | fe9acab | 2006-11-24 12:10:55 | [diff] [blame] | 756 | -a |
| 757 | </dt> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 758 | <dt class="hdlist1"> |
| 759 | --all |
| 760 | </dt> |
Junio C Hamano | fe9acab | 2006-11-24 12:10:55 | [diff] [blame] | 761 | <dd> |
| 762 | <p> |
| 763 | List both remote-tracking branches and local branches. |
Junio C Hamano | 560a1f6 | 2006-01-30 04:19:57 | [diff] [blame] | 764 | </p> |
| 765 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 766 | <dt class="hdlist1"> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 767 | --list |
| 768 | </dt> |
| 769 | <dd> |
| 770 | <p> |
| 771 | Activate the list mode. <tt>git branch <pattern></tt> would try to create a branch, |
| 772 | use <tt>git branch --list <pattern></tt> to list matching branches. |
| 773 | </p> |
| 774 | </dd> |
| 775 | <dt class="hdlist1"> |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 776 | -v |
| 777 | </dt> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 778 | <dt class="hdlist1"> |
Junio C Hamano | 4f07aec | 2012-09-25 19:08:44 | [diff] [blame] | 779 | -vv |
| 780 | </dt> |
| 781 | <dt class="hdlist1"> |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 782 | --verbose |
Junio C Hamano | 53edd07 | 2006-11-25 10:05:21 | [diff] [blame] | 783 | </dt> |
| 784 | <dd> |
| 785 | <p> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 786 | When in list mode, |
| 787 | show sha1 and commit subject line for each head, along with |
Junio C Hamano | 98e32c3 | 2009-04-13 02:39:53 | [diff] [blame] | 788 | relationship to upstream branch (if any). If given twice, print |
Junio C Hamano | 4f07aec | 2012-09-25 19:08:44 | [diff] [blame] | 789 | the name of the upstream branch, as well (see also <tt>git remote |
| 790 | show <remote></tt>). |
Junio C Hamano | 53edd07 | 2006-11-25 10:05:21 | [diff] [blame] | 791 | </p> |
| 792 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 793 | <dt class="hdlist1"> |
Junio C Hamano | 51f87de | 2012-04-16 21:18:54 | [diff] [blame] | 794 | -q |
| 795 | </dt> |
| 796 | <dt class="hdlist1"> |
| 797 | --quiet |
| 798 | </dt> |
| 799 | <dd> |
| 800 | <p> |
| 801 | Be more quiet when creating or deleting a branch, suppressing |
| 802 | non-error messages. |
| 803 | </p> |
| 804 | </dd> |
| 805 | <dt class="hdlist1"> |
Junio C Hamano | 53edd07 | 2006-11-25 10:05:21 | [diff] [blame] | 806 | --abbrev=<length> |
| 807 | </dt> |
| 808 | <dd> |
| 809 | <p> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 810 | Alter the sha1’s minimum display length in the output listing. |
Junio C Hamano | 6e41cb3 | 2011-08-29 07:12:49 | [diff] [blame] | 811 | The default value is 7 and can be overridden by the <tt>core.abbrev</tt> |
| 812 | config option. |
Junio C Hamano | 53edd07 | 2006-11-25 10:05:21 | [diff] [blame] | 813 | </p> |
| 814 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 815 | <dt class="hdlist1"> |
Junio C Hamano | a3fccdf | 2007-03-03 05:18:26 | [diff] [blame] | 816 | --no-abbrev |
| 817 | </dt> |
| 818 | <dd> |
| 819 | <p> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 820 | Display the full sha1s in the output listing rather than abbreviating them. |
Junio C Hamano | a3fccdf | 2007-03-03 05:18:26 | [diff] [blame] | 821 | </p> |
| 822 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 823 | <dt class="hdlist1"> |
Junio C Hamano | 89bdb3b | 2009-05-10 06:48:14 | [diff] [blame] | 824 | -t |
| 825 | </dt> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 826 | <dt class="hdlist1"> |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 827 | --track |
| 828 | </dt> |
| 829 | <dd> |
| 830 | <p> |
Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 831 | When creating a new branch, set up configuration to mark the |
| 832 | start-point branch as "upstream" from the new branch. This |
| 833 | configuration will tell git to show the relationship between the |
| 834 | two branches in <tt>git status</tt> and <tt>git branch -v</tt>. Furthermore, |
| 835 | it directs <tt>git pull</tt> without arguments to pull from the |
| 836 | upstream when the new branch is checked out. |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 837 | </p> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 838 | <div class="paragraph"><p>This behavior is the default when the start point is a remote-tracking branch. |
Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 839 | Set the branch.autosetupmerge configuration variable to <tt>false</tt> if you |
| 840 | want <tt>git checkout</tt> and <tt>git branch</tt> to always behave as if <em>--no-track</em> |
| 841 | were given. Set it to <tt>always</tt> if you want this behavior when the |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 842 | start-point is either a local or remote-tracking branch.</p></div> |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 843 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 844 | <dt class="hdlist1"> |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 845 | --no-track |
| 846 | </dt> |
| 847 | <dd> |
| 848 | <p> |
Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 849 | Do not set up "upstream" configuration, even if the |
| 850 | branch.autosetupmerge configuration variable is true. |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 851 | </p> |
| 852 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 853 | <dt class="hdlist1"> |
Junio C Hamano | 57827fb | 2010-01-23 03:02:50 | [diff] [blame] | 854 | --set-upstream |
| 855 | </dt> |
| 856 | <dd> |
| 857 | <p> |
Junio C Hamano | cae88e2 | 2012-03-09 00:13:20 | [diff] [blame] | 858 | If specified branch does not exist yet or if <tt>--force</tt> has been |
| 859 | given, acts exactly like <tt>--track</tt>. Otherwise sets up configuration |
| 860 | like <tt>--track</tt> would when creating the branch, except that where |
Junio C Hamano | 57827fb | 2010-01-23 03:02:50 | [diff] [blame] | 861 | branch points to is not changed. |
| 862 | </p> |
| 863 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 864 | <dt class="hdlist1"> |
Junio C Hamano | eccdd4a | 2012-09-10 23:28:17 | [diff] [blame] | 865 | -u <upstream> |
| 866 | </dt> |
| 867 | <dt class="hdlist1"> |
| 868 | --set-upstream-to=<upstream> |
| 869 | </dt> |
| 870 | <dd> |
| 871 | <p> |
| 872 | Set up <branchname>'s tracking information so <upstream> is |
| 873 | considered <branchname>'s upstream branch. If no <branchname> |
| 874 | is specified, then it defaults to the current branch. |
| 875 | </p> |
| 876 | </dd> |
| 877 | <dt class="hdlist1"> |
| 878 | --unset-upstream |
| 879 | </dt> |
| 880 | <dd> |
| 881 | <p> |
| 882 | Remove the upstream information for <branchname>. If no branch |
| 883 | is specified it defaults to the current branch. |
| 884 | </p> |
| 885 | </dd> |
| 886 | <dt class="hdlist1"> |
Junio C Hamano | 515ab1d | 2011-12-09 23:41:20 | [diff] [blame] | 887 | --edit-description |
| 888 | </dt> |
| 889 | <dd> |
| 890 | <p> |
| 891 | Open an editor and edit the text to explain what the branch is |
| 892 | for, to be used by various other commands (e.g. <tt>request-pull</tt>). |
| 893 | </p> |
| 894 | </dd> |
| 895 | <dt class="hdlist1"> |
Junio C Hamano | cae88e2 | 2012-03-09 00:13:20 | [diff] [blame] | 896 | --contains [<commit>] |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 897 | </dt> |
| 898 | <dd> |
| 899 | <p> |
Junio C Hamano | cae88e2 | 2012-03-09 00:13:20 | [diff] [blame] | 900 | Only list branches which contain the specified commit (HEAD |
| 901 | if not specified). |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 902 | </p> |
| 903 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 904 | <dt class="hdlist1"> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 905 | --merged [<commit>] |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 906 | </dt> |
| 907 | <dd> |
| 908 | <p> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 909 | Only list branches whose tips are reachable from the |
| 910 | specified commit (HEAD if not specified). |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 911 | </p> |
| 912 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 913 | <dt class="hdlist1"> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 914 | --no-merged [<commit>] |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 915 | </dt> |
| 916 | <dd> |
| 917 | <p> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 918 | Only list branches whose tips are not reachable from the |
| 919 | specified commit (HEAD if not specified). |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 920 | </p> |
| 921 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 922 | <dt class="hdlist1"> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 923 | <branchname> |
| 924 | </dt> |
| 925 | <dd> |
| 926 | <p> |
| 927 | The name of the branch to create or delete. |
Junio C Hamano | b2f5edd | 2006-05-21 10:50:09 | [diff] [blame] | 928 | The new branch name must pass all checks defined by |
Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 929 | <a href="git-check-ref-format.html">git-check-ref-format(1)</a>. Some of these checks |
Junio C Hamano | b2f5edd | 2006-05-21 10:50:09 | [diff] [blame] | 930 | may restrict the characters allowed in a branch name. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 931 | </p> |
| 932 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 933 | <dt class="hdlist1"> |
Junio C Hamano | 560a1f6 | 2006-01-30 04:19:57 | [diff] [blame] | 934 | <start-point> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 935 | </dt> |
| 936 | <dd> |
| 937 | <p> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 938 | The new branch head will point to this commit. It may be |
| 939 | given as a branch name, a commit-id, or a tag. If this |
| 940 | option is omitted, the current HEAD will be used instead. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 941 | </p> |
| 942 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 943 | <dt class="hdlist1"> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 944 | <oldbranch> |
| 945 | </dt> |
| 946 | <dd> |
| 947 | <p> |
| 948 | The name of an existing branch to rename. |
| 949 | </p> |
| 950 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 951 | <dt class="hdlist1"> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 952 | <newbranch> |
| 953 | </dt> |
| 954 | <dd> |
| 955 | <p> |
| 956 | The new name for an existing branch. The same restrictions as for |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 957 | <branchname> apply. |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 958 | </p> |
| 959 | </dd> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 960 | </dl></div> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 961 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 962 | <h2 id="_examples">Examples</h2> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 963 | <div class="sectionbody"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 964 | <div class="dlist"><dl> |
| 965 | <dt class="hdlist1"> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 966 | Start development from a known tag |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 967 | </dt> |
| 968 | <dd> |
| 969 | <div class="listingblock"> |
| 970 | <div class="content"> |
| 971 | <pre><tt>$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6 |
| 972 | $ cd my2.6 |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 973 | $ git branch my2.6.14 v2.6.14 <b><1></b> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 974 | $ git checkout my2.6.14</tt></pre> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 975 | </div></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 976 | <div class="colist arabic"><ol> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 977 | <li> |
| 978 | <p> |
| 979 | This step and the next one could be combined into a single step with |
| 980 | "checkout -b my2.6.14 v2.6.14". |
| 981 | </p> |
| 982 | </li> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 983 | </ol></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 984 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 985 | <dt class="hdlist1"> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 986 | Delete an unneeded branch |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 987 | </dt> |
| 988 | <dd> |
| 989 | <div class="listingblock"> |
| 990 | <div class="content"> |
| 991 | <pre><tt>$ git clone git://git.kernel.org/.../git.git my.git |
| 992 | $ cd my.git |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 993 | $ git branch -d -r origin/todo origin/html origin/man <b><1></b> |
| 994 | $ git branch -D test <b><2></b></tt></pre> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 995 | </div></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 996 | <div class="colist arabic"><ol> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 997 | <li> |
| 998 | <p> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 999 | Delete the remote-tracking branches "todo", "html" and "man". The next |
| 1000 | <em>fetch</em> or <em>pull</em> will create them again unless you configure them not to. |
Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1001 | See <a href="git-fetch.html">git-fetch(1)</a>. |
Junio C Hamano | 63ef0ac | 2006-12-22 07:28:18 | [diff] [blame] | 1002 | </p> |
| 1003 | </li> |
| 1004 | <li> |
| 1005 | <p> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 1006 | Delete the "test" branch even if the "master" branch (or whichever branch |
| 1007 | is currently checked out) does not have all commits from the test branch. |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1008 | </p> |
| 1009 | </li> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1010 | </ol></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1011 | </dd> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1012 | </dl></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1013 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1014 | <h2 id="_notes">Notes</h2> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1015 | <div class="sectionbody"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1016 | <div class="paragraph"><p>If you are creating a branch that you want to checkout immediately, it is |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1017 | easier to use the git checkout command with its <tt>-b</tt> option to create |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1018 | a branch and check it out with a single command.</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1019 | <div class="paragraph"><p>The options <tt>--contains</tt>, <tt>--merged</tt> and <tt>--no-merged</tt> serve three related |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1020 | but different purposes:</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1021 | <div class="ulist"><ul> |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1022 | <li> |
| 1023 | <p> |
| 1024 | <tt>--contains <commit></tt> is used to find all branches which will need |
| 1025 | special attention if <commit> were to be rebased or amended, since those |
| 1026 | branches contain the specified <commit>. |
| 1027 | </p> |
| 1028 | </li> |
| 1029 | <li> |
| 1030 | <p> |
| 1031 | <tt>--merged</tt> is used to find all branches which can be safely deleted, |
| 1032 | since those branches are fully contained by HEAD. |
| 1033 | </p> |
| 1034 | </li> |
| 1035 | <li> |
| 1036 | <p> |
| 1037 | <tt>--no-merged</tt> is used to find branches which are candidates for merging |
| 1038 | into HEAD, since those branches are not fully contained by HEAD. |
| 1039 | </p> |
| 1040 | </li> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1041 | </ul></div> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1042 | </div> |
Junio C Hamano | c276ec7 | 2009-08-26 01:35:22 | [diff] [blame] | 1043 | <h2 id="_see_also">SEE ALSO</h2> |
| 1044 | <div class="sectionbody"> |
Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1045 | <div class="paragraph"><p><a href="git-check-ref-format.html">git-check-ref-format(1)</a>, |
| 1046 | <a href="git-fetch.html">git-fetch(1)</a>, |
| 1047 | <a href="git-remote.html">git-remote(1)</a>, |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 1048 | <a href="user-manual.html#what-is-a-branch">“Understanding history: What is |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1049 | a branch?”</a> in the Git User’s Manual.</p></div> |
Junio C Hamano | c276ec7 | 2009-08-26 01:35:22 | [diff] [blame] | 1050 | </div> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1051 | <h2 id="_git">GIT</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1052 | <div class="sectionbody"> |
Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1053 | <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1054 | </div> |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 1055 | </div> |
| 1056 | <div id="footnotes"><hr /></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1057 | <div id="footer"> |
| 1058 | <div id="footer-text"> |
Junio C Hamano | 4f07aec | 2012-09-25 19:08:44 | [diff] [blame] | 1059 | Last updated 2012-09-25 12:07:50 PDT |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1060 | </div> |
| 1061 | </div> |
| 1062 | </body> |
| 1063 | </html> |