blob: 610dba21a44eb05bf02d0294aaad5ea2a4deb921 [file] [log] [blame]
Junio C Hamanob9d9d902018-05-23 07:07:421<?xml version="1.0" encoding="UTF-8"?>
Junio C Hamano1a4e8412005-12-27 08:17:232<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
3 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
4<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
5<head>
Junio C Hamano9d971152012-12-19 00:43:116<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
Junio C Hamanob9d9d902018-05-23 07:07:427<meta name="generator" content="AsciiDoc 8.6.10" />
Junio C Hamano97bcb482010-11-25 03:16:078<title>git-branch(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:239<style type="text/css">
Junio C Hamano9d971152012-12-19 00:43:1110/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
11
12/* Default font. */
13body {
14 font-family: Georgia,serif;
15}
16
17/* Title font. */
18h1, h2, h3, h4, h5, h6,
19div.title, caption.title,
20thead, p.table.header,
21#toctitle,
22#author, #revnumber, #revdate, #revremark,
23#footer {
24 font-family: Arial,Helvetica,sans-serif;
Junio C Hamano1a4e8412005-12-27 08:17:2325}
26
27body {
28 margin: 1em 5% 1em 5%;
29}
30
Junio C Hamanoba4b9282008-07-06 05:20:3131a {
32 color: blue;
33 text-decoration: underline;
34}
35a:visited {
36 color: fuchsia;
37}
Junio C Hamano1a4e8412005-12-27 08:17:2338
39em {
40 font-style: italic;
Junio C Hamano97bcb482010-11-25 03:16:0741 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:2342}
43
44strong {
45 font-weight: bold;
Junio C Hamano97bcb482010-11-25 03:16:0746 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:2347}
48
Junio C Hamano1a4e8412005-12-27 08:17:2349h1, h2, h3, h4, h5, h6 {
50 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:2351 margin-top: 1.2em;
52 margin-bottom: 0.5em;
53 line-height: 1.3;
54}
55
Junio C Hamanoba4b9282008-07-06 05:20:3156h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:2357 border-bottom: 2px solid silver;
58}
59h2 {
Junio C Hamano1a4e8412005-12-27 08:17:2360 padding-top: 0.5em;
61}
Junio C Hamanoba4b9282008-07-06 05:20:3162h3 {
63 float: left;
64}
65h3 + * {
66 clear: left;
67}
Junio C Hamano9d971152012-12-19 00:43:1168h5 {
69 font-size: 1.0em;
70}
Junio C Hamano1a4e8412005-12-27 08:17:2371
72div.sectionbody {
Junio C Hamano1a4e8412005-12-27 08:17:2373 margin-left: 0;
74}
75
76hr {
77 border: 1px solid silver;
78}
79
80p {
81 margin-top: 0.5em;
82 margin-bottom: 0.5em;
83}
84
Junio C Hamano97bcb482010-11-25 03:16:0785ul, ol, li > p {
86 margin-top: 0;
87}
Junio C Hamano9d971152012-12-19 00:43:1188ul > li { color: #aaa; }
89ul > li > * { color: black; }
Junio C Hamano97bcb482010-11-25 03:16:0790
Junio C Hamanoc14e6ad2014-10-31 20:25:5391.monospaced, code, pre {
92 font-family: "Courier New", Courier, monospace;
93 font-size: inherit;
94 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:2395 padding: 0;
96 margin: 0;
97}
Junio C Hamanoc14e6ad2014-10-31 20:25:5398pre {
99 white-space: pre-wrap;
100}
Junio C Hamano1a4e8412005-12-27 08:17:23101
Junio C Hamano9d971152012-12-19 00:43:11102#author {
Junio C Hamano1a4e8412005-12-27 08:17:23103 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23104 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31105 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23106}
Junio C Hamano9d971152012-12-19 00:43:11107#email {
Junio C Hamano1a4e8412005-12-27 08:17:23108}
Junio C Hamano9d971152012-12-19 00:43:11109#revnumber, #revdate, #revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23110}
111
Junio C Hamano9d971152012-12-19 00:43:11112#footer {
Junio C Hamano1a4e8412005-12-27 08:17:23113 font-size: small;
114 border-top: 2px solid silver;
115 padding-top: 0.5em;
116 margin-top: 4.0em;
117}
Junio C Hamano9d971152012-12-19 00:43:11118#footer-text {
Junio C Hamano1a4e8412005-12-27 08:17:23119 float: left;
120 padding-bottom: 0.5em;
121}
Junio C Hamano9d971152012-12-19 00:43:11122#footer-badges {
Junio C Hamano1a4e8412005-12-27 08:17:23123 float: right;
124 padding-bottom: 0.5em;
125}
126
Junio C Hamano9d971152012-12-19 00:43:11127#preamble {
Junio C Hamano97bcb482010-11-25 03:16:07128 margin-top: 1.5em;
129 margin-bottom: 1.5em;
130}
Junio C Hamano9d971152012-12-19 00:43:11131div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1a4e8412005-12-27 08:17:23132div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22134 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23135 margin-bottom: 1.5em;
136}
137div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22138 margin-top: 2.0em;
139 margin-bottom: 2.0em;
140 margin-right: 10%;
141 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23142}
143
144div.content { /* Block element content. */
145 padding: 0;
146}
147
148/* Block element titles. */
149div.title, caption.title {
Junio C Hamano97bcb482010-11-25 03:16:07150 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23151 font-weight: bold;
152 text-align: left;
153 margin-top: 1.0em;
154 margin-bottom: 0.5em;
155}
156div.title + * {
157 margin-top: 0;
158}
159
160td div.title:first-child {
161 margin-top: 0.0em;
162}
163div.content div.title:first-child {
164 margin-top: 0.0em;
165}
166div.content + div.title {
167 margin-top: 0.0em;
168}
169
170div.sidebarblock > div.content {
171 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11172 border: 1px solid #dddddd;
173 border-left: 4px solid #f0f0f0;
Junio C Hamano1a4e8412005-12-27 08:17:23174 padding: 0.5em;
175}
176
177div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11178 border: 1px solid #dddddd;
179 border-left: 5px solid #f0f0f0;
180 background: #f8f8f8;
Junio C Hamano1a4e8412005-12-27 08:17:23181 padding: 0.5em;
182}
183
Junio C Hamano7bd050f2011-09-22 06:32:22184div.quoteblock, div.verseblock {
185 padding-left: 1.0em;
186 margin-left: 1.0em;
Junio C Hamano97bcb482010-11-25 03:16:07187 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11188 border-left: 5px solid #f0f0f0;
189 color: #888;
Junio C Hamano1a4e8412005-12-27 08:17:23190}
Junio C Hamano7bd050f2011-09-22 06:32:22191
Junio C Hamano97bcb482010-11-25 03:16:07192div.quoteblock > div.attribution {
193 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23194 text-align: right;
195}
Junio C Hamano97bcb482010-11-25 03:16:07196
Junio C Hamano9d971152012-12-19 00:43:11197div.verseblock > pre.content {
198 font-family: inherit;
199 font-size: inherit;
Junio C Hamano97bcb482010-11-25 03:16:07200}
201div.verseblock > div.attribution {
202 padding-top: 0.75em;
203 text-align: left;
204}
205/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31206div.verseblock + div.attribution {
207 text-align: left;
208}
Junio C Hamano1a4e8412005-12-27 08:17:23209
210div.admonitionblock .icon {
211 vertical-align: top;
212 font-size: 1.1em;
213 font-weight: bold;
214 text-decoration: underline;
215 color: #527bbd;
216 padding-right: 0.5em;
217}
218div.admonitionblock td.content {
219 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22220 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23221}
222
223div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22224 border-left: 3px solid #dddddd;
225 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23226}
227
Junio C Hamano1a4e8412005-12-27 08:17:23228div.imageblock div.content { padding-left: 0; }
Junio C Hamanoc14e6ad2014-10-31 20:25:53229span.image img { border-style: none; vertical-align: text-bottom; }
Junio C Hamano97bcb482010-11-25 03:16:07230a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23231
232dl {
233 margin-top: 0.8em;
234 margin-bottom: 0.8em;
235}
236dt {
237 margin-top: 0.5em;
238 margin-bottom: 0;
Junio C Hamano97bcb482010-11-25 03:16:07239 font-style: normal;
240 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23241}
242dd > *:first-child {
Junio C Hamano97bcb482010-11-25 03:16:07243 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23244}
245
246ul, ol {
247 list-style-position: outside;
248}
Junio C Hamano97bcb482010-11-25 03:16:07249ol.arabic {
250 list-style-type: decimal;
251}
252ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23253 list-style-type: lower-alpha;
254}
Junio C Hamano97bcb482010-11-25 03:16:07255ol.upperalpha {
256 list-style-type: upper-alpha;
257}
258ol.lowerroman {
259 list-style-type: lower-roman;
260}
261ol.upperroman {
262 list-style-type: upper-roman;
263}
264
265div.compact ul, div.compact ol,
266div.compact p, div.compact p,
267div.compact div, div.compact div {
268 margin-top: 0.1em;
269 margin-bottom: 0.1em;
270}
Junio C Hamano1a4e8412005-12-27 08:17:23271
Junio C Hamano1a4e8412005-12-27 08:17:23272tfoot {
273 font-weight: bold;
274}
Junio C Hamano97bcb482010-11-25 03:16:07275td > div.verse {
276 white-space: pre;
277}
Junio C Hamano97bcb482010-11-25 03:16:07278
279div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23280 margin-top: 0.8em;
281 margin-bottom: 0.8em;
282}
Junio C Hamano97bcb482010-11-25 03:16:07283div.hdlist tr {
284 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31285}
Junio C Hamano97bcb482010-11-25 03:16:07286dt.hdlist1.strong, td.hdlist1.strong {
287 font-weight: bold;
288}
289td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23290 vertical-align: top;
Junio C Hamano97bcb482010-11-25 03:16:07291 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23292 padding-right: 0.8em;
Junio C Hamano97bcb482010-11-25 03:16:07293 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23294}
Junio C Hamano97bcb482010-11-25 03:16:07295td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23296 vertical-align: top;
297}
Junio C Hamano97bcb482010-11-25 03:16:07298div.hdlist.compact tr {
299 margin: 0;
300 padding-bottom: 0;
301}
302
303.comment {
304 background: yellow;
305}
Junio C Hamano1a4e8412005-12-27 08:17:23306
Junio C Hamano7bd050f2011-09-22 06:32:22307.footnote, .footnoteref {
308 font-size: 0.8em;
309}
310
311span.footnote, span.footnoteref {
312 vertical-align: super;
313}
314
315#footnotes {
316 margin: 20px 0 20px 0;
317 padding: 7px 0 0 0;
318}
319
320#footnotes div.footnote {
321 margin: 0 0 5px 0;
322}
323
324#footnotes hr {
325 border: none;
326 border-top: 1px solid silver;
327 height: 1px;
328 text-align: left;
329 margin-left: 0;
330 width: 20%;
331 min-width: 100px;
332}
333
Junio C Hamano9d971152012-12-19 00:43:11334div.colist td {
335 padding-right: 0.5em;
336 padding-bottom: 0.3em;
337 vertical-align: top;
338}
339div.colist td img {
340 margin-top: 0.3em;
Junio C Hamano1a4e8412005-12-27 08:17:23341}
Junio C Hamanoba4b9282008-07-06 05:20:31342
Junio C Hamano9d971152012-12-19 00:43:11343@media print {
344 #footer-badges { display: none; }
345}
346
347#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22348 margin-bottom: 2.5em;
349}
350
Junio C Hamano9d971152012-12-19 00:43:11351#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31352 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31353 font-size: 1.1em;
354 font-weight: bold;
355 margin-top: 1.0em;
356 margin-bottom: 0.1em;
357}
358
Junio C Hamanoc14e6ad2014-10-31 20:25:53359div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31360 margin-top: 0;
361 margin-bottom: 0;
362}
363div.toclevel2 {
364 margin-left: 2em;
365 font-size: 0.9em;
366}
367div.toclevel3 {
368 margin-left: 4em;
369 font-size: 0.9em;
370}
371div.toclevel4 {
372 margin-left: 6em;
373 font-size: 0.9em;
374}
Junio C Hamano9d971152012-12-19 00:43:11375
376span.aqua { color: aqua; }
377span.black { color: black; }
378span.blue { color: blue; }
379span.fuchsia { color: fuchsia; }
380span.gray { color: gray; }
381span.green { color: green; }
382span.lime { color: lime; }
383span.maroon { color: maroon; }
384span.navy { color: navy; }
385span.olive { color: olive; }
386span.purple { color: purple; }
387span.red { color: red; }
388span.silver { color: silver; }
389span.teal { color: teal; }
390span.white { color: white; }
391span.yellow { color: yellow; }
392
393span.aqua-background { background: aqua; }
394span.black-background { background: black; }
395span.blue-background { background: blue; }
396span.fuchsia-background { background: fuchsia; }
397span.gray-background { background: gray; }
398span.green-background { background: green; }
399span.lime-background { background: lime; }
400span.maroon-background { background: maroon; }
401span.navy-background { background: navy; }
402span.olive-background { background: olive; }
403span.purple-background { background: purple; }
404span.red-background { background: red; }
405span.silver-background { background: silver; }
406span.teal-background { background: teal; }
407span.white-background { background: white; }
408span.yellow-background { background: yellow; }
409
410span.big { font-size: 2em; }
411span.small { font-size: 0.6em; }
412
413span.underline { text-decoration: underline; }
414span.overline { text-decoration: overline; }
415span.line-through { text-decoration: line-through; }
416
Junio C Hamanoc14e6ad2014-10-31 20:25:53417div.unbreakable { page-break-inside: avoid; }
418
Junio C Hamano9d971152012-12-19 00:43:11419
420/*
421 * xhtml11 specific
422 *
423 * */
424
425div.tableblock {
426 margin-top: 1.0em;
427 margin-bottom: 1.5em;
428}
429div.tableblock > table {
430 border: 3px solid #527bbd;
431}
432thead, p.table.header {
433 font-weight: bold;
434 color: #527bbd;
435}
436p.table {
437 margin-top: 0;
438}
439/* Because the table frame attribute is overriden by CSS in most browsers. */
440div.tableblock > table[frame="void"] {
441 border-style: none;
442}
443div.tableblock > table[frame="hsides"] {
444 border-left-style: none;
445 border-right-style: none;
446}
447div.tableblock > table[frame="vsides"] {
448 border-top-style: none;
449 border-bottom-style: none;
450}
451
452
453/*
454 * html5 specific
455 *
456 * */
457
458table.tableblock {
459 margin-top: 1.0em;
460 margin-bottom: 1.5em;
461}
462thead, p.tableblock.header {
463 font-weight: bold;
464 color: #527bbd;
465}
466p.tableblock {
467 margin-top: 0;
468}
469table.tableblock {
470 border-width: 3px;
471 border-spacing: 0px;
472 border-style: solid;
473 border-color: #527bbd;
474 border-collapse: collapse;
475}
476th.tableblock, td.tableblock {
477 border-width: 1px;
478 padding: 4px;
479 border-style: solid;
480 border-color: #527bbd;
481}
482
483table.tableblock.frame-topbot {
484 border-left-style: hidden;
485 border-right-style: hidden;
486}
487table.tableblock.frame-sides {
488 border-top-style: hidden;
489 border-bottom-style: hidden;
490}
491table.tableblock.frame-none {
492 border-style: hidden;
493}
494
495th.tableblock.halign-left, td.tableblock.halign-left {
496 text-align: left;
497}
498th.tableblock.halign-center, td.tableblock.halign-center {
499 text-align: center;
500}
501th.tableblock.halign-right, td.tableblock.halign-right {
502 text-align: right;
503}
504
505th.tableblock.valign-top, td.tableblock.valign-top {
506 vertical-align: top;
507}
508th.tableblock.valign-middle, td.tableblock.valign-middle {
509 vertical-align: middle;
510}
511th.tableblock.valign-bottom, td.tableblock.valign-bottom {
512 vertical-align: bottom;
513}
514
515
516/*
517 * manpage specific
518 *
519 * */
520
521body.manpage h1 {
Junio C Hamano97bcb482010-11-25 03:16:07522 padding-top: 0.5em;
523 padding-bottom: 0.5em;
524 border-top: 2px solid silver;
525 border-bottom: 2px solid silver;
526}
Junio C Hamano9d971152012-12-19 00:43:11527body.manpage h2 {
Junio C Hamano97bcb482010-11-25 03:16:07528 border-style: none;
529}
Junio C Hamano9d971152012-12-19 00:43:11530body.manpage div.sectionbody {
531 margin-left: 3em;
Junio C Hamano97bcb482010-11-25 03:16:07532}
533
534@media print {
Junio C Hamano9d971152012-12-19 00:43:11535 body.manpage div#toc { display: none; }
Junio C Hamano97bcb482010-11-25 03:16:07536}
Junio C Hamanoc14e6ad2014-10-31 20:25:53537
538
Junio C Hamano1a4e8412005-12-27 08:17:23539</style>
Junio C Hamano7bd050f2011-09-22 06:32:22540<script type="text/javascript">
541/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22542var asciidoc = { // Namespace.
543
544/////////////////////////////////////////////////////////////////////
545// Table Of Contents generator
546/////////////////////////////////////////////////////////////////////
547
548/* Author: Mihai Bazon, September 2002
549 * http://students.infoiasi.ro/~mishoo
550 *
551 * Table Of Content generator
552 * Version: 0.4
553 *
554 * Feel free to use this script under the terms of the GNU General Public
555 * License, as long as you do not remove or alter this notice.
556 */
557
558 /* modified by Troy D. Hanson, September 2006. License: GPL */
559 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
560
561// toclevels = 1..4.
562toc: function (toclevels) {
563
564 function getText(el) {
565 var text = "";
566 for (var i = el.firstChild; i != null; i = i.nextSibling) {
567 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
568 text += i.data;
569 else if (i.firstChild != null)
570 text += getText(i);
571 }
572 return text;
573 }
574
575 function TocEntry(el, text, toclevel) {
576 this.element = el;
577 this.text = text;
578 this.toclevel = toclevel;
579 }
580
581 function tocEntries(el, toclevels) {
582 var result = new Array;
Junio C Hamanoc14e6ad2014-10-31 20:25:53583 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22584 // Function that scans the DOM tree for header elements (the DOM2
585 // nodeIterator API would be a better technique but not supported by all
586 // browsers).
587 var iterate = function (el) {
588 for (var i = el.firstChild; i != null; i = i.nextSibling) {
589 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
590 var mo = re.exec(i.tagName);
591 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
592 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
593 }
594 iterate(i);
595 }
596 }
597 }
598 iterate(el);
599 return result;
600 }
601
602 var toc = document.getElementById("toc");
Junio C Hamano9d971152012-12-19 00:43:11603 if (!toc) {
604 return;
605 }
606
607 // Delete existing TOC entries in case we're reloading the TOC.
608 var tocEntriesToRemove = [];
609 var i;
610 for (i = 0; i < toc.childNodes.length; i++) {
611 var entry = toc.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53612 if (entry.nodeName.toLowerCase() == 'div'
Junio C Hamano9d971152012-12-19 00:43:11613 && entry.getAttribute("class")
614 && entry.getAttribute("class").match(/^toclevel/))
615 tocEntriesToRemove.push(entry);
616 }
617 for (i = 0; i < tocEntriesToRemove.length; i++) {
618 toc.removeChild(tocEntriesToRemove[i]);
619 }
620
621 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22622 var entries = tocEntries(document.getElementById("content"), toclevels);
623 for (var i = 0; i < entries.length; ++i) {
624 var entry = entries[i];
625 if (entry.element.id == "")
626 entry.element.id = "_toc_" + i;
627 var a = document.createElement("a");
628 a.href = "#" + entry.element.id;
629 a.appendChild(document.createTextNode(entry.text));
630 var div = document.createElement("div");
631 div.appendChild(a);
632 div.className = "toclevel" + entry.toclevel;
633 toc.appendChild(div);
634 }
635 if (entries.length == 0)
636 toc.parentNode.removeChild(toc);
637},
638
639
640/////////////////////////////////////////////////////////////////////
641// Footnotes generator
642/////////////////////////////////////////////////////////////////////
643
644/* Based on footnote generation code from:
645 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
646 */
647
648footnotes: function () {
Junio C Hamano9d971152012-12-19 00:43:11649 // Delete existing footnote entries in case we're reloading the footnodes.
650 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22651 var noteholder = document.getElementById("footnotes");
Junio C Hamano9d971152012-12-19 00:43:11652 if (!noteholder) {
653 return;
654 }
655 var entriesToRemove = [];
656 for (i = 0; i < noteholder.childNodes.length; i++) {
657 var entry = noteholder.childNodes[i];
Junio C Hamanoc14e6ad2014-10-31 20:25:53658 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
Junio C Hamano9d971152012-12-19 00:43:11659 entriesToRemove.push(entry);
660 }
661 for (i = 0; i < entriesToRemove.length; i++) {
662 noteholder.removeChild(entriesToRemove[i]);
663 }
664
665 // Rebuild footnote entries.
666 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22667 var spans = cont.getElementsByTagName("span");
668 var refs = {};
669 var n = 0;
670 for (i=0; i<spans.length; i++) {
671 if (spans[i].className == "footnote") {
672 n++;
Junio C Hamano9d971152012-12-19 00:43:11673 var note = spans[i].getAttribute("data-note");
674 if (!note) {
675 // Use [\s\S] in place of . so multi-line matches work.
676 // Because JavaScript has no s (dotall) regex flag.
677 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
678 spans[i].innerHTML =
679 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
680 "' title='View footnote' class='footnote'>" + n + "</a>]";
681 spans[i].setAttribute("data-note", note);
682 }
Junio C Hamano7bd050f2011-09-22 06:32:22683 noteholder.innerHTML +=
684 "<div class='footnote' id='_footnote_" + n + "'>" +
685 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
686 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22687 var id =spans[i].getAttribute("id");
688 if (id != null) refs["#"+id] = n;
689 }
690 }
691 if (n == 0)
692 noteholder.parentNode.removeChild(noteholder);
693 else {
694 // Process footnoterefs.
695 for (i=0; i<spans.length; i++) {
696 if (spans[i].className == "footnoteref") {
697 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
698 href = href.match(/#.*/)[0]; // Because IE return full URL.
699 n = refs[href];
700 spans[i].innerHTML =
701 "[<a href='#_footnote_" + n +
702 "' title='View footnote' class='footnote'>" + n + "</a>]";
703 }
704 }
705 }
Junio C Hamano9d971152012-12-19 00:43:11706},
707
708install: function(toclevels) {
709 var timerId;
710
711 function reinstall() {
712 asciidoc.footnotes();
713 if (toclevels) {
714 asciidoc.toc(toclevels);
715 }
716 }
717
718 function reinstallAndRemoveTimer() {
719 clearInterval(timerId);
720 reinstall();
721 }
722
723 timerId = setInterval(reinstall, 500);
724 if (document.addEventListener)
725 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
726 else
727 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22728}
729
730}
Junio C Hamano9d971152012-12-19 00:43:11731asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22732/*]]>*/
733</script>
Junio C Hamano1a4e8412005-12-27 08:17:23734</head>
Junio C Hamano9d971152012-12-19 00:43:11735<body class="manpage">
Junio C Hamano1a4e8412005-12-27 08:17:23736<div id="header">
737<h1>
738git-branch(1) Manual Page
739</h1>
740<h2>NAME</h2>
741<div class="sectionbody">
742<p>git-branch -
Junio C Hamano7c73c662007-01-19 00:37:50743 List, create, or delete branches
Junio C Hamano1a4e8412005-12-27 08:17:23744</p>
745</div>
746</div>
Junio C Hamano7bd050f2011-09-22 06:32:22747<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11748<div class="sect1">
Junio C Hamano97bcb482010-11-25 03:16:07749<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23750<div class="sectionbody">
Junio C Hamano2b135272006-03-18 07:45:42751<div class="verseblock">
Junio C Hamano9d971152012-12-19 00:43:11752<pre class="content"><em>git branch</em> [--color[=&lt;when&gt;] | --no-color] [-r | -a]
Junio C Hamano8fb66e52011-10-05 20:59:51753 [--list] [-v [--abbrev=&lt;length&gt; | --no-abbrev]]
Junio C Hamano59a5f532017-04-11 08:38:02754 [--column[=&lt;options&gt;] | --no-column] [--sort=&lt;key&gt;]
755 [(--merged | --no-merged) [&lt;commit&gt;]]
756 [--contains [&lt;commit]] [--no-contains [&lt;commit&gt;]]
Junio C Hamanocbe0eb22017-02-27 23:37:49757 [--points-at &lt;object&gt;] [--format=&lt;format&gt;] [&lt;pattern&gt;&#8230;]
Junio C Hamano912712b2017-12-06 18:04:01758<em>git branch</em> [--track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]
Junio C Hamanoeccdd4a2012-09-10 23:28:17759<em>git branch</em> (--set-upstream-to=&lt;upstream&gt; | -u &lt;upstream&gt;) [&lt;branchname&gt;]
760<em>git branch</em> --unset-upstream [&lt;branchname&gt;]
Junio C Hamanofce7c7e2008-07-02 03:06:38761<em>git branch</em> (-m | -M) [&lt;oldbranch&gt;] &lt;newbranch&gt;
Junio C Hamano139b7d12017-10-03 07:10:59762<em>git branch</em> (-c | -C) [&lt;oldbranch&gt;] &lt;newbranch&gt;
Junio C Hamano515ab1d2011-12-09 23:41:20763<em>git branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;
Junio C Hamano9d971152012-12-19 00:43:11764<em>git branch</em> --edit-description [&lt;branchname&gt;]</pre>
765<div class="attribution">
Junio C Hamano97bcb482010-11-25 03:16:07766</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23767</div>
Junio C Hamano9d971152012-12-19 00:43:11768</div>
769<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31770<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23771<div class="sectionbody">
Junio C Hamanoc14e6ad2014-10-31 20:25:53772<div class="paragraph"><p>If <code>--list</code> is given, or if there are no non-option arguments, existing
Junio C Hamanob5e079f2013-02-08 00:02:52773branches are listed; the current branch will be highlighted with an
Junio C Hamanoc14e6ad2014-10-31 20:25:53774asterisk. Option <code>-r</code> causes the remote-tracking branches to be listed,
775and option <code>-a</code> shows both local and remote branches. If a <code>&lt;pattern&gt;</code>
Junio C Hamanob5e079f2013-02-08 00:02:52776is given, it is used as a shell wildcard to restrict the output to
777matching branches. If multiple patterns are given, a branch is shown if
778it matches any of the patterns. Note that when providing a
Junio C Hamanoc14e6ad2014-10-31 20:25:53779<code>&lt;pattern&gt;</code>, you must use <code>--list</code>; otherwise the command is interpreted
Junio C Hamanob5e079f2013-02-08 00:02:52780as branch creation.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53781<div class="paragraph"><p>With <code>--contains</code>, shows only the branches that contain the named commit
Junio C Hamanofd83b8e2009-03-22 08:21:41782(in other words, the branches whose tip commits are descendants of the
Junio C Hamano59a5f532017-04-11 08:38:02783named commit), <code>--no-contains</code> inverts it. With <code>--merged</code>, only branches
784merged into the named commit (i.e. the branches whose tip commits are
785reachable from the named commit) will be listed. With <code>--no-merged</code> only
786branches not merged into the named commit will be listed. If the &lt;commit&gt;
787argument is missing it defaults to <code>HEAD</code> (i.e. the tip of the current
788branch).</p></div>
Junio C Hamano97bcb482010-11-25 03:16:07789<div class="paragraph"><p>The command&#8217;s second form creates a new branch head named &lt;branchname&gt;
Junio C Hamano92d80372016-07-13 22:00:05790which points to the current <code>HEAD</code>, or &lt;start-point&gt; if given.</p></div>
Junio C Hamano97bcb482010-11-25 03:16:07791<div class="paragraph"><p>Note that this will create the new branch, but it will not switch the
Junio C Hamano1b50ce92007-10-03 12:05:53792working tree to it; use "git checkout &lt;newbranch&gt;" to switch to the
Junio C Hamanoba4b9282008-07-06 05:20:31793new branch.</p></div>
Junio C Hamano076ffcc2013-02-06 05:13:21794<div class="paragraph"><p>When a local branch is started off a remote-tracking branch, Git sets up the
Junio C Hamanoc14e6ad2014-10-31 20:25:53795branch (specifically the <code>branch.&lt;name&gt;.remote</code> and <code>branch.&lt;name&gt;.merge</code>
Junio C Hamano79f4c7c2013-09-20 21:03:37796configuration entries) so that <em>git pull</em> will appropriately merge from
Junio C Hamano97bcb482010-11-25 03:16:07797the remote-tracking branch. This behavior may be changed via the global
Junio C Hamano322c6242015-03-23 21:32:46798<code>branch.autoSetupMerge</code> configuration flag. That setting can be
Junio C Hamanoc14e6ad2014-10-31 20:25:53799overridden by using the <code>--track</code> and <code>--no-track</code> options, and
800changed later using <code>git branch --set-upstream-to</code>.</p></div>
801<div class="paragraph"><p>With a <code>-m</code> or <code>-M</code> option, &lt;oldbranch&gt; will be renamed to &lt;newbranch&gt;.
Junio C Hamanoe7935c42006-12-13 21:32:17802If &lt;oldbranch&gt; had a corresponding reflog, it is renamed to match
803&lt;newbranch&gt;, and a reflog entry is created to remember the branch
804renaming. If &lt;newbranch&gt; exists, -M must be used to force the rename
Junio C Hamanoba4b9282008-07-06 05:20:31805to happen.</p></div>
Junio C Hamano139b7d12017-10-03 07:10:59806<div class="paragraph"><p>The <code>-c</code> and <code>-C</code> options have the exact same semantics as <code>-m</code> and
807<code>-M</code>, except instead of the branch being renamed it along with its
808config and reflog will be copied to a new name.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53809<div class="paragraph"><p>With a <code>-d</code> or <code>-D</code> option, <code>&lt;branchname&gt;</code> will be deleted. You may
Junio C Hamano341071d2006-06-04 07:24:48810specify more than one branch for deletion. If the branch currently
Junio C Hamanoba4b9282008-07-06 05:20:31811has a reflog then the reflog will also be deleted.</p></div>
Junio C Hamanoc14e6ad2014-10-31 20:25:53812<div class="paragraph"><p>Use <code>-r</code> together with <code>-d</code> to delete remote-tracking branches. Note, that it
Junio C Hamano258e4412007-11-29 02:28:32813only makes sense to delete remote-tracking branches if they no longer exist
Junio C Hamano1aa40d22010-01-21 17:46:43814in the remote repository or if <em>git fetch</em> was configured not to fetch
Junio C Hamanoa28a9202012-06-21 07:08:23815them again. See also the <em>prune</em> subcommand of <a href="git-remote.html">git-remote(1)</a> for a
Junio C Hamanofd83b8e2009-03-22 08:21:41816way to clean up all obsolete remote-tracking branches.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23817</div>
Junio C Hamano9d971152012-12-19 00:43:11818</div>
819<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31820<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23821<div class="sectionbody">
Junio C Hamano97bcb482010-11-25 03:16:07822<div class="dlist"><dl>
823<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23824-d
825</dt>
Junio C Hamano8fb66e52011-10-05 20:59:51826<dt class="hdlist1">
827--delete
828</dt>
Junio C Hamano1a4e8412005-12-27 08:17:23829<dd>
830<p>
Junio C Hamanod9657062010-04-18 00:01:03831 Delete a branch. The branch must be fully merged in its
Junio C Hamanoc14e6ad2014-10-31 20:25:53832 upstream branch, or in <code>HEAD</code> if no upstream was set with
Junio C Hamano912712b2017-12-06 18:04:01833 <code>--track</code> or <code>--set-upstream-to</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23834</p>
835</dd>
Junio C Hamano97bcb482010-11-25 03:16:07836<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23837-D
838</dt>
839<dd>
840<p>
Junio C Hamano823eebb2015-07-10 22:29:34841 Shortcut for <code>--delete --force</code>.
Junio C Hamano1a4e8412005-12-27 08:17:23842</p>
843</dd>
Junio C Hamano97bcb482010-11-25 03:16:07844<dt class="hdlist1">
Junio C Hamano8fb66e52011-10-05 20:59:51845--create-reflog
846</dt>
Junio C Hamano341071d2006-06-04 07:24:48847<dd>
848<p>
Junio C Hamano97bcb482010-11-25 03:16:07849 Create the branch&#8217;s reflog. This activates recording of
Junio C Hamano1d90cb02007-07-03 07:05:31850 all changes made to the branch ref, enabling use of date
851 based sha1 expressions such as "&lt;branchname&gt;@{yesterday}".
Junio C Hamanoe7495622010-04-09 07:18:35852 Note that in non-bare repositories, reflogs are usually
Junio C Hamanof0888582017-09-28 06:34:39853 enabled by default by the <code>core.logAllRefUpdates</code> config option.
Junio C Hamanoa8e42612017-02-03 21:44:07854 The negated form <code>--no-create-reflog</code> only overrides an earlier
855 <code>--create-reflog</code>, but currently does not negate the setting of
Junio C Hamanof0888582017-09-28 06:34:39856 <code>core.logAllRefUpdates</code>.
Junio C Hamano341071d2006-06-04 07:24:48857</p>
Junio C Hamanoea1ac8d2018-07-18 20:16:48858<div class="paragraph"><p>The <code>-l</code> option is a deprecated synonym for <code>--create-reflog</code>.</p></div>
Junio C Hamano341071d2006-06-04 07:24:48859</dd>
Junio C Hamano97bcb482010-11-25 03:16:07860<dt class="hdlist1">
Junio C Hamano560a1f62006-01-30 04:19:57861-f
862</dt>
Junio C Hamano97bcb482010-11-25 03:16:07863<dt class="hdlist1">
Junio C Hamano68cfa3a2009-08-30 00:22:55864--force
865</dt>
Junio C Hamano560a1f62006-01-30 04:19:57866<dd>
867<p>
Junio C Hamanof7e3f472017-10-20 06:45:24868 Reset &lt;branchname&gt; to &lt;startpoint&gt;, even if &lt;branchname&gt; exists
869 already. Without <code>-f</code>, <em>git branch</em> refuses to change an existing branch.
Junio C Hamano823eebb2015-07-10 22:29:34870 In combination with <code>-d</code> (or <code>--delete</code>), allow deleting the
871 branch irrespective of its merged status. In combination with
872 <code>-m</code> (or <code>--move</code>), allow renaming the branch even if the new
Junio C Hamano139b7d12017-10-03 07:10:59873 branch name already exists, the same applies for <code>-c</code> (or <code>--copy</code>).
Junio C Hamanoc8d88c22006-04-29 07:02:01874</p>
875</dd>
Junio C Hamano97bcb482010-11-25 03:16:07876<dt class="hdlist1">
Junio C Hamanoe7935c42006-12-13 21:32:17877-m
878</dt>
Junio C Hamano8fb66e52011-10-05 20:59:51879<dt class="hdlist1">
880--move
881</dt>
Junio C Hamanoe7935c42006-12-13 21:32:17882<dd>
883<p>
884 Move/rename a branch and the corresponding reflog.
885</p>
886</dd>
Junio C Hamano97bcb482010-11-25 03:16:07887<dt class="hdlist1">
Junio C Hamanoe7935c42006-12-13 21:32:17888-M
889</dt>
890<dd>
891<p>
Junio C Hamano823eebb2015-07-10 22:29:34892 Shortcut for <code>--move --force</code>.
Junio C Hamanoe7935c42006-12-13 21:32:17893</p>
894</dd>
Junio C Hamano97bcb482010-11-25 03:16:07895<dt class="hdlist1">
Junio C Hamano139b7d12017-10-03 07:10:59896-c
897</dt>
898<dt class="hdlist1">
899--copy
900</dt>
901<dd>
902<p>
903 Copy a branch and the corresponding reflog.
904</p>
905</dd>
906<dt class="hdlist1">
907-C
908</dt>
909<dd>
910<p>
911 Shortcut for <code>--copy --force</code>.
912</p>
913</dd>
914<dt class="hdlist1">
Junio C Hamano4aa0bcc2010-03-03 05:13:12915--color[=&lt;when&gt;]
Junio C Hamanoeb692952007-01-03 22:02:12916</dt>
917<dd>
918<p>
Junio C Hamano97bcb482010-11-25 03:16:07919 Color branches to highlight current, local, and
920 remote-tracking branches.
Junio C Hamano4aa0bcc2010-03-03 05:13:12921 The value must be always (the default), never, or auto.
Junio C Hamanoeb692952007-01-03 22:02:12922</p>
923</dd>
Junio C Hamano97bcb482010-11-25 03:16:07924<dt class="hdlist1">
Junio C Hamanoeb692952007-01-03 22:02:12925--no-color
926</dt>
927<dd>
928<p>
929 Turn off branch colors, even when the configuration file gives the
930 default to color output.
Junio C Hamanoc14e6ad2014-10-31 20:25:53931 Same as <code>--color=never</code>.
Junio C Hamanoeb692952007-01-03 22:02:12932</p>
933</dd>
Junio C Hamano97bcb482010-11-25 03:16:07934<dt class="hdlist1">
Junio C Hamano52b1cfb2016-12-20 00:18:36935-i
936</dt>
937<dt class="hdlist1">
938--ignore-case
939</dt>
940<dd>
941<p>
942 Sorting and filtering branches are case insensitive.
943</p>
944</dd>
945<dt class="hdlist1">
Junio C Hamano22700fb2012-05-03 23:07:25946--column[=&lt;options&gt;]
947</dt>
948<dt class="hdlist1">
949--no-column
950</dt>
951<dd>
952<p>
953 Display branch listing in columns. See configuration variable
Junio C Hamanoc14e6ad2014-10-31 20:25:53954 column.branch for option syntax.<code>--column</code> and <code>--no-column</code>
Junio C Hamano22700fb2012-05-03 23:07:25955 without options are equivalent to <em>always</em> and <em>never</em> respectively.
956</p>
957<div class="paragraph"><p>This option is only applicable in non-verbose mode.</p></div>
958</dd>
959<dt class="hdlist1">
Junio C Hamanoc8d88c22006-04-29 07:02:01960-r
961</dt>
Junio C Hamano8fb66e52011-10-05 20:59:51962<dt class="hdlist1">
963--remotes
964</dt>
Junio C Hamanoc8d88c22006-04-29 07:02:01965<dd>
966<p>
Junio C Hamano63ef0ac2006-12-22 07:28:18967 List or delete (if used with -d) the remote-tracking branches.
Junio C Hamanofe9acab2006-11-24 12:10:55968</p>
969</dd>
Junio C Hamano97bcb482010-11-25 03:16:07970<dt class="hdlist1">
Junio C Hamanofe9acab2006-11-24 12:10:55971-a
972</dt>
Junio C Hamano8fb66e52011-10-05 20:59:51973<dt class="hdlist1">
974--all
975</dt>
Junio C Hamanofe9acab2006-11-24 12:10:55976<dd>
977<p>
978 List both remote-tracking branches and local branches.
Junio C Hamano560a1f62006-01-30 04:19:57979</p>
980</dd>
Junio C Hamano97bcb482010-11-25 03:16:07981<dt class="hdlist1">
Junio C Hamano8fb66e52011-10-05 20:59:51982--list
983</dt>
984<dd>
985<p>
Junio C Hamano2affb962017-03-28 22:01:40986 List branches. With optional <code>&lt;pattern&gt;...</code>, e.g. <code>git
987 branch --list 'maint-*'</code>, list only the branches that match
988 the pattern(s).
Junio C Hamano8fb66e52011-10-05 20:59:51989</p>
Junio C Hamano2affb962017-03-28 22:01:40990<div class="paragraph"><p>This should not be confused with <code>git branch -l &lt;branchname&gt;</code>,
991which creates a branch named <code>&lt;branchname&gt;</code> with a reflog.
992See <code>--create-reflog</code> above for details.</p></div>
Junio C Hamano8fb66e52011-10-05 20:59:51993</dd>
994<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47995-v
996</dt>
Junio C Hamano97bcb482010-11-25 03:16:07997<dt class="hdlist1">
Junio C Hamano4f07aec2012-09-25 19:08:44998-vv
999</dt>
1000<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:471001--verbose
Junio C Hamano53edd072006-11-25 10:05:211002</dt>
1003<dd>
1004<p>
Junio C Hamano8fb66e52011-10-05 20:59:511005 When in list mode,
1006 show sha1 and commit subject line for each head, along with
Junio C Hamano98e32c32009-04-13 02:39:531007 relationship to upstream branch (if any). If given twice, print
Junio C Hamanoc14e6ad2014-10-31 20:25:531008 the name of the upstream branch, as well (see also <code>git remote
1009 show &lt;remote&gt;</code>).
Junio C Hamano53edd072006-11-25 10:05:211010</p>
1011</dd>
Junio C Hamano97bcb482010-11-25 03:16:071012<dt class="hdlist1">
Junio C Hamano51f87de2012-04-16 21:18:541013-q
1014</dt>
1015<dt class="hdlist1">
1016--quiet
1017</dt>
1018<dd>
1019<p>
1020 Be more quiet when creating or deleting a branch, suppressing
1021 non-error messages.
1022</p>
1023</dd>
1024<dt class="hdlist1">
Junio C Hamano53edd072006-11-25 10:05:211025--abbrev=&lt;length&gt;
1026</dt>
1027<dd>
1028<p>
Junio C Hamano97bcb482010-11-25 03:16:071029 Alter the sha1&#8217;s minimum display length in the output listing.
Junio C Hamanoc14e6ad2014-10-31 20:25:531030 The default value is 7 and can be overridden by the <code>core.abbrev</code>
Junio C Hamano6e41cb32011-08-29 07:12:491031 config option.
Junio C Hamano53edd072006-11-25 10:05:211032</p>
1033</dd>
Junio C Hamano97bcb482010-11-25 03:16:071034<dt class="hdlist1">
Junio C Hamanoa3fccdf2007-03-03 05:18:261035--no-abbrev
1036</dt>
1037<dd>
1038<p>
Junio C Hamanofd83b8e2009-03-22 08:21:411039 Display the full sha1s in the output listing rather than abbreviating them.
Junio C Hamanoa3fccdf2007-03-03 05:18:261040</p>
1041</dd>
Junio C Hamano97bcb482010-11-25 03:16:071042<dt class="hdlist1">
Junio C Hamano89bdb3b2009-05-10 06:48:141043-t
1044</dt>
Junio C Hamano97bcb482010-11-25 03:16:071045<dt class="hdlist1">
Junio C Hamano1b50ce92007-10-03 12:05:531046--track
1047</dt>
1048<dd>
1049<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:531050 When creating a new branch, set up <code>branch.&lt;name&gt;.remote</code> and
1051 <code>branch.&lt;name&gt;.merge</code> configuration entries to mark the
Junio C Hamano3bd66e92009-04-18 06:17:561052 start-point branch as "upstream" from the new branch. This
1053 configuration will tell git to show the relationship between the
Junio C Hamanoc14e6ad2014-10-31 20:25:531054 two branches in <code>git status</code> and <code>git branch -v</code>. Furthermore,
1055 it directs <code>git pull</code> without arguments to pull from the
Junio C Hamano3bd66e92009-04-18 06:17:561056 upstream when the new branch is checked out.
Junio C Hamano1b50ce92007-10-03 12:05:531057</p>
Junio C Hamano97bcb482010-11-25 03:16:071058<div class="paragraph"><p>This behavior is the default when the start point is a remote-tracking branch.
Junio C Hamano322c6242015-03-23 21:32:461059Set the branch.autoSetupMerge configuration variable to <code>false</code> if you
Junio C Hamano92d80372016-07-13 22:00:051060want <code>git checkout</code> and <code>git branch</code> to always behave as if <code>--no-track</code>
Junio C Hamanoc14e6ad2014-10-31 20:25:531061were given. Set it to <code>always</code> if you want this behavior when the
Junio C Hamano97bcb482010-11-25 03:16:071062start-point is either a local or remote-tracking branch.</p></div>
Junio C Hamano1b50ce92007-10-03 12:05:531063</dd>
Junio C Hamano97bcb482010-11-25 03:16:071064<dt class="hdlist1">
Junio C Hamano1b50ce92007-10-03 12:05:531065--no-track
1066</dt>
1067<dd>
1068<p>
Junio C Hamano3bd66e92009-04-18 06:17:561069 Do not set up "upstream" configuration, even if the
Junio C Hamano322c6242015-03-23 21:32:461070 branch.autoSetupMerge configuration variable is true.
Junio C Hamano1b50ce92007-10-03 12:05:531071</p>
1072</dd>
Junio C Hamano97bcb482010-11-25 03:16:071073<dt class="hdlist1">
Junio C Hamano57827fb2010-01-23 03:02:501074--set-upstream
1075</dt>
1076<dd>
1077<p>
Junio C Hamanobc39b7d2017-09-06 04:37:231078 As this option had confusing syntax, it is no longer supported.
1079 Please use <code>--track</code> or <code>--set-upstream-to</code> instead.
Junio C Hamano57827fb2010-01-23 03:02:501080</p>
1081</dd>
Junio C Hamano97bcb482010-11-25 03:16:071082<dt class="hdlist1">
Junio C Hamanoeccdd4a2012-09-10 23:28:171083-u &lt;upstream&gt;
1084</dt>
1085<dt class="hdlist1">
1086--set-upstream-to=&lt;upstream&gt;
1087</dt>
1088<dd>
1089<p>
1090 Set up &lt;branchname&gt;'s tracking information so &lt;upstream&gt; is
1091 considered &lt;branchname&gt;'s upstream branch. If no &lt;branchname&gt;
1092 is specified, then it defaults to the current branch.
1093</p>
1094</dd>
1095<dt class="hdlist1">
1096--unset-upstream
1097</dt>
1098<dd>
1099<p>
1100 Remove the upstream information for &lt;branchname&gt;. If no branch
1101 is specified it defaults to the current branch.
1102</p>
1103</dd>
1104<dt class="hdlist1">
Junio C Hamano515ab1d2011-12-09 23:41:201105--edit-description
1106</dt>
1107<dd>
1108<p>
1109 Open an editor and edit the text to explain what the branch is
Junio C Hamano7db630e2015-09-17 20:26:221110 for, to be used by various other commands (e.g. <code>format-patch</code>,
1111 <code>request-pull</code>, and <code>merge</code> (if enabled)). Multi-line explanations
1112 may be used.
Junio C Hamano515ab1d2011-12-09 23:41:201113</p>
1114</dd>
1115<dt class="hdlist1">
Junio C Hamanocae88e22012-03-09 00:13:201116--contains [&lt;commit&gt;]
Junio C Hamano47d68a52008-05-06 06:35:401117</dt>
1118<dd>
1119<p>
Junio C Hamanocae88e22012-03-09 00:13:201120 Only list branches which contain the specified commit (HEAD
Junio C Hamanoc14e6ad2014-10-31 20:25:531121 if not specified). Implies <code>--list</code>.
Junio C Hamano47d68a52008-05-06 06:35:401122</p>
1123</dd>
Junio C Hamano97bcb482010-11-25 03:16:071124<dt class="hdlist1">
Junio C Hamano59a5f532017-04-11 08:38:021125--no-contains [&lt;commit&gt;]
1126</dt>
1127<dd>
1128<p>
1129 Only list branches which don&#8217;t contain the specified commit
1130 (HEAD if not specified). Implies <code>--list</code>.
1131</p>
1132</dd>
1133<dt class="hdlist1">
Junio C Hamanoc0e55e72009-10-10 00:56:291134--merged [&lt;commit&gt;]
Junio C Hamano47d68a52008-05-06 06:35:401135</dt>
1136<dd>
1137<p>
Junio C Hamanoc0e55e72009-10-10 00:56:291138 Only list branches whose tips are reachable from the
Junio C Hamano59a5f532017-04-11 08:38:021139 specified commit (HEAD if not specified). Implies <code>--list</code>,
1140 incompatible with <code>--no-merged</code>.
Junio C Hamano47d68a52008-05-06 06:35:401141</p>
1142</dd>
Junio C Hamano97bcb482010-11-25 03:16:071143<dt class="hdlist1">
Junio C Hamanoc0e55e72009-10-10 00:56:291144--no-merged [&lt;commit&gt;]
Junio C Hamano47d68a52008-05-06 06:35:401145</dt>
1146<dd>
1147<p>
Junio C Hamanoc0e55e72009-10-10 00:56:291148 Only list branches whose tips are not reachable from the
Junio C Hamano59a5f532017-04-11 08:38:021149 specified commit (HEAD if not specified). Implies <code>--list</code>,
1150 incompatible with <code>--merged</code>.
Junio C Hamano47d68a52008-05-06 06:35:401151</p>
1152</dd>
Junio C Hamano97bcb482010-11-25 03:16:071153<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:231154&lt;branchname&gt;
1155</dt>
1156<dd>
1157<p>
1158 The name of the branch to create or delete.
Junio C Hamanob2f5edd2006-05-21 10:50:091159 The new branch name must pass all checks defined by
Junio C Hamanoa28a9202012-06-21 07:08:231160 <a href="git-check-ref-format.html">git-check-ref-format(1)</a>. Some of these checks
Junio C Hamanob2f5edd2006-05-21 10:50:091161 may restrict the characters allowed in a branch name.
Junio C Hamano1a4e8412005-12-27 08:17:231162</p>
1163</dd>
Junio C Hamano97bcb482010-11-25 03:16:071164<dt class="hdlist1">
Junio C Hamano560a1f62006-01-30 04:19:571165&lt;start-point&gt;
Junio C Hamano1a4e8412005-12-27 08:17:231166</dt>
1167<dd>
1168<p>
Junio C Hamanoc0e55e72009-10-10 00:56:291169 The new branch head will point to this commit. It may be
1170 given as a branch name, a commit-id, or a tag. If this
1171 option is omitted, the current HEAD will be used instead.
Junio C Hamano1a4e8412005-12-27 08:17:231172</p>
1173</dd>
Junio C Hamano97bcb482010-11-25 03:16:071174<dt class="hdlist1">
Junio C Hamanoe7935c42006-12-13 21:32:171175&lt;oldbranch&gt;
1176</dt>
1177<dd>
1178<p>
1179 The name of an existing branch to rename.
1180</p>
1181</dd>
Junio C Hamano97bcb482010-11-25 03:16:071182<dt class="hdlist1">
Junio C Hamanoe7935c42006-12-13 21:32:171183&lt;newbranch&gt;
1184</dt>
1185<dd>
1186<p>
1187 The new name for an existing branch. The same restrictions as for
Junio C Hamanofd83b8e2009-03-22 08:21:411188 &lt;branchname&gt; apply.
Junio C Hamanoe7935c42006-12-13 21:32:171189</p>
1190</dd>
Junio C Hamanob0a1e832015-10-15 23:08:311191<dt class="hdlist1">
1192--sort=&lt;key&gt;
1193</dt>
1194<dd>
1195<p>
1196 Sort based on the key given. Prefix <code>-</code> to sort in descending
1197 order of the value. You may use the --sort=&lt;key&gt; option
1198 multiple times, in which case the last key becomes the primary
1199 key. The keys supported are the same as those in <code>git
1200 for-each-ref</code>. Sort order defaults to sorting based on the
1201 full refname (including <code>refs/...</code> prefix). This lists
1202 detached HEAD (if present) first, then local branches and
1203 finally remote-tracking branches.
1204</p>
1205</dd>
1206<dt class="hdlist1">
1207--points-at &lt;object&gt;
1208</dt>
1209<dd>
1210<p>
1211 Only list branches of the given object.
1212</p>
1213</dd>
Junio C Hamanocbe0eb22017-02-27 23:37:491214<dt class="hdlist1">
1215--format &lt;format&gt;
1216</dt>
1217<dd>
1218<p>
Junio C Hamanoa4ff7292017-08-23 21:56:431219 A string that interpolates <code>%(fieldname)</code> from a branch ref being shown
1220 and the object it points at. The format is the same as
Junio C Hamanocbe0eb22017-02-27 23:37:491221 that of <a href="git-for-each-ref.html">git-for-each-ref(1)</a>.
1222</p>
1223</dd>
Junio C Hamanoba4b9282008-07-06 05:20:311224</dl></div>
Junio C Hamanoc8d88c22006-04-29 07:02:011225</div>
Junio C Hamano9d971152012-12-19 00:43:111226</div>
1227<div class="sect1">
Junio C Hamano7da67f72017-11-29 01:12:471228<h2 id="_configuration">CONFIGURATION</h2>
1229<div class="sectionbody">
1230<div class="paragraph"><p><code>pager.branch</code> is only respected when listing branches, i.e., when
1231<code>--list</code> is used or implied. The default is to use a pager.
1232See <a href="git-config.html">git-config(1)</a>.</p></div>
1233</div>
1234</div>
1235<div class="sect1">
Junio C Hamanob9d9d902018-05-23 07:07:421236<h2 id="_examples">EXAMPLES</h2>
Junio C Hamanoc8d88c22006-04-29 07:02:011237<div class="sectionbody">
Junio C Hamano97bcb482010-11-25 03:16:071238<div class="dlist"><dl>
1239<dt class="hdlist1">
Junio C Hamanofd83b8e2009-03-22 08:21:411240Start development from a known tag
Junio C Hamano1a4e8412005-12-27 08:17:231241</dt>
1242<dd>
1243<div class="listingblock">
1244<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531245<pre><code>$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
Junio C Hamano1a4e8412005-12-27 08:17:231246$ cd my2.6
Junio C Hamano97bcb482010-11-25 03:16:071247$ git branch my2.6.14 v2.6.14 <b>&lt;1&gt;</b>
Junio C Hamanoc14e6ad2014-10-31 20:25:531248$ git checkout my2.6.14</code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:231249</div></div>
Junio C Hamano97bcb482010-11-25 03:16:071250<div class="colist arabic"><ol>
Junio C Hamanoc8d88c22006-04-29 07:02:011251<li>
1252<p>
1253This step and the next one could be combined into a single step with
1254"checkout -b my2.6.14 v2.6.14".
1255</p>
1256</li>
Junio C Hamanoba4b9282008-07-06 05:20:311257</ol></div>
Junio C Hamano1a4e8412005-12-27 08:17:231258</dd>
Junio C Hamano97bcb482010-11-25 03:16:071259<dt class="hdlist1">
Junio C Hamanofd83b8e2009-03-22 08:21:411260Delete an unneeded branch
Junio C Hamano1a4e8412005-12-27 08:17:231261</dt>
1262<dd>
1263<div class="listingblock">
1264<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:531265<pre><code>$ git clone git://git.kernel.org/.../git.git my.git
Junio C Hamano1a4e8412005-12-27 08:17:231266$ cd my.git
Junio C Hamano97bcb482010-11-25 03:16:071267$ git branch -d -r origin/todo origin/html origin/man <b>&lt;1&gt;</b>
Junio C Hamanoc14e6ad2014-10-31 20:25:531268$ git branch -D test <b>&lt;2&gt;</b></code></pre>
Junio C Hamano1a4e8412005-12-27 08:17:231269</div></div>
Junio C Hamano97bcb482010-11-25 03:16:071270<div class="colist arabic"><ol>
Junio C Hamanoc8d88c22006-04-29 07:02:011271<li>
1272<p>
Junio C Hamanofd83b8e2009-03-22 08:21:411273Delete the remote-tracking branches "todo", "html" and "man". The next
1274<em>fetch</em> or <em>pull</em> will create them again unless you configure them not to.
Junio C Hamanoa28a9202012-06-21 07:08:231275See <a href="git-fetch.html">git-fetch(1)</a>.
Junio C Hamano63ef0ac2006-12-22 07:28:181276</p>
1277</li>
1278<li>
1279<p>
Junio C Hamanofd83b8e2009-03-22 08:21:411280Delete the "test" branch even if the "master" branch (or whichever branch
1281is currently checked out) does not have all commits from the test branch.
Junio C Hamanoc8d88c22006-04-29 07:02:011282</p>
1283</li>
Junio C Hamanoba4b9282008-07-06 05:20:311284</ol></div>
Junio C Hamano1a4e8412005-12-27 08:17:231285</dd>
Junio C Hamanoba4b9282008-07-06 05:20:311286</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:231287</div>
Junio C Hamano9d971152012-12-19 00:43:111288</div>
1289<div class="sect1">
Junio C Hamanob9d9d902018-05-23 07:07:421290<h2 id="_notes">NOTES</h2>
Junio C Hamanoc8d88c22006-04-29 07:02:011291<div class="sectionbody">
Junio C Hamano97bcb482010-11-25 03:16:071292<div class="paragraph"><p>If you are creating a branch that you want to checkout immediately, it is
Junio C Hamanoc14e6ad2014-10-31 20:25:531293easier to use the git checkout command with its <code>-b</code> option to create
Junio C Hamanoba4b9282008-07-06 05:20:311294a branch and check it out with a single command.</p></div>
Junio C Hamano59a5f532017-04-11 08:38:021295<div class="paragraph"><p>The options <code>--contains</code>, <code>--no-contains</code>, <code>--merged</code> and <code>--no-merged</code>
1296serve four related but different purposes:</p></div>
Junio C Hamano97bcb482010-11-25 03:16:071297<div class="ulist"><ul>
Junio C Hamano47d68a52008-05-06 06:35:401298<li>
1299<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:531300<code>--contains &lt;commit&gt;</code> is used to find all branches which will need
Junio C Hamano47d68a52008-05-06 06:35:401301 special attention if &lt;commit&gt; were to be rebased or amended, since those
1302 branches contain the specified &lt;commit&gt;.
1303</p>
1304</li>
1305<li>
1306<p>
Junio C Hamano59a5f532017-04-11 08:38:021307<code>--no-contains &lt;commit&gt;</code> is the inverse of that, i.e. branches that don&#8217;t
1308 contain the specified &lt;commit&gt;.
1309</p>
1310</li>
1311<li>
1312<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:531313<code>--merged</code> is used to find all branches which can be safely deleted,
Junio C Hamano47d68a52008-05-06 06:35:401314 since those branches are fully contained by HEAD.
1315</p>
1316</li>
1317<li>
1318<p>
Junio C Hamanoc14e6ad2014-10-31 20:25:531319<code>--no-merged</code> is used to find branches which are candidates for merging
Junio C Hamano47d68a52008-05-06 06:35:401320 into HEAD, since those branches are not fully contained by HEAD.
1321</p>
1322</li>
Junio C Hamanoba4b9282008-07-06 05:20:311323</ul></div>
Junio C Hamanoc8d88c22006-04-29 07:02:011324</div>
Junio C Hamano9d971152012-12-19 00:43:111325</div>
1326<div class="sect1">
Junio C Hamanoc276ec72009-08-26 01:35:221327<h2 id="_see_also">SEE ALSO</h2>
1328<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:231329<div class="paragraph"><p><a href="git-check-ref-format.html">git-check-ref-format(1)</a>,
1330<a href="git-fetch.html">git-fetch(1)</a>,
1331<a href="git-remote.html">git-remote(1)</a>,
Junio C Hamanoc0e55e72009-10-10 00:56:291332<a href="user-manual.html#what-is-a-branch">&#8220;Understanding history: What is
Junio C Hamano97bcb482010-11-25 03:16:071333a branch?&#8221;</a> in the Git User&#8217;s Manual.</p></div>
Junio C Hamanoc276ec72009-08-26 01:35:221334</div>
Junio C Hamano9d971152012-12-19 00:43:111335</div>
1336<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311337<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:231338<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:231339<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:231340</div>
Junio C Hamano7bd050f2011-09-22 06:32:221341</div>
Junio C Hamano9d971152012-12-19 00:43:111342</div>
Junio C Hamano7bd050f2011-09-22 06:32:221343<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:231344<div id="footer">
1345<div id="footer-text">
Junio C Hamano2ef0ba32018-01-26 23:13:531346Last updated
Junio C Hamanoea1ac8d2018-07-18 20:16:481347 2018-07-18 13:16:04 PDT
Junio C Hamano1a4e8412005-12-27 08:17:231348</div>
1349</div>
1350</body>
1351</html>