Junio C Hamano | b9d9d90 | 2018-05-23 07:07:42 | [diff] [blame] | 1 | <?xml version="1.0" encoding="UTF-8"?> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 2 | <!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 Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 6 | <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> |
Junio C Hamano | b9d9d90 | 2018-05-23 07:07:42 | [diff] [blame] | 7 | <meta name="generator" content="AsciiDoc 8.6.10" /> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 8 | <title>git-branch(1)</title> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 9 | <style type="text/css"> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 10 | /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ |
| 11 | |
| 12 | /* Default font. */ |
| 13 | body { |
| 14 | font-family: Georgia,serif; |
| 15 | } |
| 16 | |
| 17 | /* Title font. */ |
| 18 | h1, h2, h3, h4, h5, h6, |
| 19 | div.title, caption.title, |
| 20 | thead, p.table.header, |
| 21 | #toctitle, |
| 22 | #author, #revnumber, #revdate, #revremark, |
| 23 | #footer { |
| 24 | font-family: Arial,Helvetica,sans-serif; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 25 | } |
| 26 | |
| 27 | body { |
| 28 | margin: 1em 5% 1em 5%; |
| 29 | } |
| 30 | |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 31 | a { |
| 32 | color: blue; |
| 33 | text-decoration: underline; |
| 34 | } |
| 35 | a:visited { |
| 36 | color: fuchsia; |
| 37 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 38 | |
| 39 | em { |
| 40 | font-style: italic; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 41 | color: navy; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 42 | } |
| 43 | |
| 44 | strong { |
| 45 | font-weight: bold; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 46 | color: #083194; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 47 | } |
| 48 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 49 | h1, h2, h3, h4, h5, h6 { |
| 50 | color: #527bbd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 51 | margin-top: 1.2em; |
| 52 | margin-bottom: 0.5em; |
| 53 | line-height: 1.3; |
| 54 | } |
| 55 | |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 56 | h1, h2, h3 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 57 | border-bottom: 2px solid silver; |
| 58 | } |
| 59 | h2 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 60 | padding-top: 0.5em; |
| 61 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 62 | h3 { |
| 63 | float: left; |
| 64 | } |
| 65 | h3 + * { |
| 66 | clear: left; |
| 67 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 68 | h5 { |
| 69 | font-size: 1.0em; |
| 70 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 71 | |
| 72 | div.sectionbody { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 73 | margin-left: 0; |
| 74 | } |
| 75 | |
| 76 | hr { |
| 77 | border: 1px solid silver; |
| 78 | } |
| 79 | |
| 80 | p { |
| 81 | margin-top: 0.5em; |
| 82 | margin-bottom: 0.5em; |
| 83 | } |
| 84 | |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 85 | ul, ol, li > p { |
| 86 | margin-top: 0; |
| 87 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 88 | ul > li { color: #aaa; } |
| 89 | ul > li > * { color: black; } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 90 | |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 91 | .monospaced, code, pre { |
| 92 | font-family: "Courier New", Courier, monospace; |
| 93 | font-size: inherit; |
| 94 | color: navy; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 95 | padding: 0; |
| 96 | margin: 0; |
| 97 | } |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 98 | pre { |
| 99 | white-space: pre-wrap; |
| 100 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 101 | |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 102 | #author { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 103 | color: #527bbd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 104 | font-weight: bold; |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 105 | font-size: 1.1em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 106 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 107 | #email { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 108 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 109 | #revnumber, #revdate, #revremark { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 110 | } |
| 111 | |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 112 | #footer { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 113 | font-size: small; |
| 114 | border-top: 2px solid silver; |
| 115 | padding-top: 0.5em; |
| 116 | margin-top: 4.0em; |
| 117 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 118 | #footer-text { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 119 | float: left; |
| 120 | padding-bottom: 0.5em; |
| 121 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 122 | #footer-badges { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 123 | float: right; |
| 124 | padding-bottom: 0.5em; |
| 125 | } |
| 126 | |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 127 | #preamble { |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 128 | margin-top: 1.5em; |
| 129 | margin-bottom: 1.5em; |
| 130 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 131 | div.imageblock, div.exampleblock, div.verseblock, |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 132 | div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, |
| 133 | div.admonitionblock { |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 134 | margin-top: 1.0em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 135 | margin-bottom: 1.5em; |
| 136 | } |
| 137 | div.admonitionblock { |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 138 | margin-top: 2.0em; |
| 139 | margin-bottom: 2.0em; |
| 140 | margin-right: 10%; |
| 141 | color: #606060; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 142 | } |
| 143 | |
| 144 | div.content { /* Block element content. */ |
| 145 | padding: 0; |
| 146 | } |
| 147 | |
| 148 | /* Block element titles. */ |
| 149 | div.title, caption.title { |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 150 | color: #527bbd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 151 | font-weight: bold; |
| 152 | text-align: left; |
| 153 | margin-top: 1.0em; |
| 154 | margin-bottom: 0.5em; |
| 155 | } |
| 156 | div.title + * { |
| 157 | margin-top: 0; |
| 158 | } |
| 159 | |
| 160 | td div.title:first-child { |
| 161 | margin-top: 0.0em; |
| 162 | } |
| 163 | div.content div.title:first-child { |
| 164 | margin-top: 0.0em; |
| 165 | } |
| 166 | div.content + div.title { |
| 167 | margin-top: 0.0em; |
| 168 | } |
| 169 | |
| 170 | div.sidebarblock > div.content { |
| 171 | background: #ffffee; |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 172 | border: 1px solid #dddddd; |
| 173 | border-left: 4px solid #f0f0f0; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 174 | padding: 0.5em; |
| 175 | } |
| 176 | |
| 177 | div.listingblock > div.content { |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 178 | border: 1px solid #dddddd; |
| 179 | border-left: 5px solid #f0f0f0; |
| 180 | background: #f8f8f8; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 181 | padding: 0.5em; |
| 182 | } |
| 183 | |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 184 | div.quoteblock, div.verseblock { |
| 185 | padding-left: 1.0em; |
| 186 | margin-left: 1.0em; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 187 | margin-right: 10%; |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 188 | border-left: 5px solid #f0f0f0; |
| 189 | color: #888; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 190 | } |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 191 | |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 192 | div.quoteblock > div.attribution { |
| 193 | padding-top: 0.5em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 194 | text-align: right; |
| 195 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 196 | |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 197 | div.verseblock > pre.content { |
| 198 | font-family: inherit; |
| 199 | font-size: inherit; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 200 | } |
| 201 | div.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 Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 206 | div.verseblock + div.attribution { |
| 207 | text-align: left; |
| 208 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 209 | |
| 210 | div.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 | } |
| 218 | div.admonitionblock td.content { |
| 219 | padding-left: 0.5em; |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 220 | border-left: 3px solid #dddddd; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 221 | } |
| 222 | |
| 223 | div.exampleblock > div.content { |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 224 | border-left: 3px solid #dddddd; |
| 225 | padding-left: 0.5em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 226 | } |
| 227 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 228 | div.imageblock div.content { padding-left: 0; } |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 229 | span.image img { border-style: none; vertical-align: text-bottom; } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 230 | a.image:visited { color: white; } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 231 | |
| 232 | dl { |
| 233 | margin-top: 0.8em; |
| 234 | margin-bottom: 0.8em; |
| 235 | } |
| 236 | dt { |
| 237 | margin-top: 0.5em; |
| 238 | margin-bottom: 0; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 239 | font-style: normal; |
| 240 | color: navy; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 241 | } |
| 242 | dd > *:first-child { |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 243 | margin-top: 0.1em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 244 | } |
| 245 | |
| 246 | ul, ol { |
| 247 | list-style-position: outside; |
| 248 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 249 | ol.arabic { |
| 250 | list-style-type: decimal; |
| 251 | } |
| 252 | ol.loweralpha { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 253 | list-style-type: lower-alpha; |
| 254 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 255 | ol.upperalpha { |
| 256 | list-style-type: upper-alpha; |
| 257 | } |
| 258 | ol.lowerroman { |
| 259 | list-style-type: lower-roman; |
| 260 | } |
| 261 | ol.upperroman { |
| 262 | list-style-type: upper-roman; |
| 263 | } |
| 264 | |
| 265 | div.compact ul, div.compact ol, |
| 266 | div.compact p, div.compact p, |
| 267 | div.compact div, div.compact div { |
| 268 | margin-top: 0.1em; |
| 269 | margin-bottom: 0.1em; |
| 270 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 271 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 272 | tfoot { |
| 273 | font-weight: bold; |
| 274 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 275 | td > div.verse { |
| 276 | white-space: pre; |
| 277 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 278 | |
| 279 | div.hdlist { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 280 | margin-top: 0.8em; |
| 281 | margin-bottom: 0.8em; |
| 282 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 283 | div.hdlist tr { |
| 284 | padding-bottom: 15px; |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 285 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 286 | dt.hdlist1.strong, td.hdlist1.strong { |
| 287 | font-weight: bold; |
| 288 | } |
| 289 | td.hdlist1 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 290 | vertical-align: top; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 291 | font-style: normal; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 292 | padding-right: 0.8em; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 293 | color: navy; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 294 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 295 | td.hdlist2 { |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 296 | vertical-align: top; |
| 297 | } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 298 | div.hdlist.compact tr { |
| 299 | margin: 0; |
| 300 | padding-bottom: 0; |
| 301 | } |
| 302 | |
| 303 | .comment { |
| 304 | background: yellow; |
| 305 | } |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 306 | |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 307 | .footnote, .footnoteref { |
| 308 | font-size: 0.8em; |
| 309 | } |
| 310 | |
| 311 | span.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 Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 334 | div.colist td { |
| 335 | padding-right: 0.5em; |
| 336 | padding-bottom: 0.3em; |
| 337 | vertical-align: top; |
| 338 | } |
| 339 | div.colist td img { |
| 340 | margin-top: 0.3em; |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 341 | } |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 342 | |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 343 | @media print { |
| 344 | #footer-badges { display: none; } |
| 345 | } |
| 346 | |
| 347 | #toc { |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 348 | margin-bottom: 2.5em; |
| 349 | } |
| 350 | |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 351 | #toctitle { |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 352 | color: #527bbd; |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 353 | font-size: 1.1em; |
| 354 | font-weight: bold; |
| 355 | margin-top: 1.0em; |
| 356 | margin-bottom: 0.1em; |
| 357 | } |
| 358 | |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 359 | div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 360 | margin-top: 0; |
| 361 | margin-bottom: 0; |
| 362 | } |
| 363 | div.toclevel2 { |
| 364 | margin-left: 2em; |
| 365 | font-size: 0.9em; |
| 366 | } |
| 367 | div.toclevel3 { |
| 368 | margin-left: 4em; |
| 369 | font-size: 0.9em; |
| 370 | } |
| 371 | div.toclevel4 { |
| 372 | margin-left: 6em; |
| 373 | font-size: 0.9em; |
| 374 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 375 | |
| 376 | span.aqua { color: aqua; } |
| 377 | span.black { color: black; } |
| 378 | span.blue { color: blue; } |
| 379 | span.fuchsia { color: fuchsia; } |
| 380 | span.gray { color: gray; } |
| 381 | span.green { color: green; } |
| 382 | span.lime { color: lime; } |
| 383 | span.maroon { color: maroon; } |
| 384 | span.navy { color: navy; } |
| 385 | span.olive { color: olive; } |
| 386 | span.purple { color: purple; } |
| 387 | span.red { color: red; } |
| 388 | span.silver { color: silver; } |
| 389 | span.teal { color: teal; } |
| 390 | span.white { color: white; } |
| 391 | span.yellow { color: yellow; } |
| 392 | |
| 393 | span.aqua-background { background: aqua; } |
| 394 | span.black-background { background: black; } |
| 395 | span.blue-background { background: blue; } |
| 396 | span.fuchsia-background { background: fuchsia; } |
| 397 | span.gray-background { background: gray; } |
| 398 | span.green-background { background: green; } |
| 399 | span.lime-background { background: lime; } |
| 400 | span.maroon-background { background: maroon; } |
| 401 | span.navy-background { background: navy; } |
| 402 | span.olive-background { background: olive; } |
| 403 | span.purple-background { background: purple; } |
| 404 | span.red-background { background: red; } |
| 405 | span.silver-background { background: silver; } |
| 406 | span.teal-background { background: teal; } |
| 407 | span.white-background { background: white; } |
| 408 | span.yellow-background { background: yellow; } |
| 409 | |
| 410 | span.big { font-size: 2em; } |
| 411 | span.small { font-size: 0.6em; } |
| 412 | |
| 413 | span.underline { text-decoration: underline; } |
| 414 | span.overline { text-decoration: overline; } |
| 415 | span.line-through { text-decoration: line-through; } |
| 416 | |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 417 | div.unbreakable { page-break-inside: avoid; } |
| 418 | |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 419 | |
| 420 | /* |
| 421 | * xhtml11 specific |
| 422 | * |
| 423 | * */ |
| 424 | |
| 425 | div.tableblock { |
| 426 | margin-top: 1.0em; |
| 427 | margin-bottom: 1.5em; |
| 428 | } |
| 429 | div.tableblock > table { |
| 430 | border: 3px solid #527bbd; |
| 431 | } |
| 432 | thead, p.table.header { |
| 433 | font-weight: bold; |
| 434 | color: #527bbd; |
| 435 | } |
| 436 | p.table { |
| 437 | margin-top: 0; |
| 438 | } |
| 439 | /* Because the table frame attribute is overriden by CSS in most browsers. */ |
| 440 | div.tableblock > table[frame="void"] { |
| 441 | border-style: none; |
| 442 | } |
| 443 | div.tableblock > table[frame="hsides"] { |
| 444 | border-left-style: none; |
| 445 | border-right-style: none; |
| 446 | } |
| 447 | div.tableblock > table[frame="vsides"] { |
| 448 | border-top-style: none; |
| 449 | border-bottom-style: none; |
| 450 | } |
| 451 | |
| 452 | |
| 453 | /* |
| 454 | * html5 specific |
| 455 | * |
| 456 | * */ |
| 457 | |
| 458 | table.tableblock { |
| 459 | margin-top: 1.0em; |
| 460 | margin-bottom: 1.5em; |
| 461 | } |
| 462 | thead, p.tableblock.header { |
| 463 | font-weight: bold; |
| 464 | color: #527bbd; |
| 465 | } |
| 466 | p.tableblock { |
| 467 | margin-top: 0; |
| 468 | } |
| 469 | table.tableblock { |
| 470 | border-width: 3px; |
| 471 | border-spacing: 0px; |
| 472 | border-style: solid; |
| 473 | border-color: #527bbd; |
| 474 | border-collapse: collapse; |
| 475 | } |
| 476 | th.tableblock, td.tableblock { |
| 477 | border-width: 1px; |
| 478 | padding: 4px; |
| 479 | border-style: solid; |
| 480 | border-color: #527bbd; |
| 481 | } |
| 482 | |
| 483 | table.tableblock.frame-topbot { |
| 484 | border-left-style: hidden; |
| 485 | border-right-style: hidden; |
| 486 | } |
| 487 | table.tableblock.frame-sides { |
| 488 | border-top-style: hidden; |
| 489 | border-bottom-style: hidden; |
| 490 | } |
| 491 | table.tableblock.frame-none { |
| 492 | border-style: hidden; |
| 493 | } |
| 494 | |
| 495 | th.tableblock.halign-left, td.tableblock.halign-left { |
| 496 | text-align: left; |
| 497 | } |
| 498 | th.tableblock.halign-center, td.tableblock.halign-center { |
| 499 | text-align: center; |
| 500 | } |
| 501 | th.tableblock.halign-right, td.tableblock.halign-right { |
| 502 | text-align: right; |
| 503 | } |
| 504 | |
| 505 | th.tableblock.valign-top, td.tableblock.valign-top { |
| 506 | vertical-align: top; |
| 507 | } |
| 508 | th.tableblock.valign-middle, td.tableblock.valign-middle { |
| 509 | vertical-align: middle; |
| 510 | } |
| 511 | th.tableblock.valign-bottom, td.tableblock.valign-bottom { |
| 512 | vertical-align: bottom; |
| 513 | } |
| 514 | |
| 515 | |
| 516 | /* |
| 517 | * manpage specific |
| 518 | * |
| 519 | * */ |
| 520 | |
| 521 | body.manpage h1 { |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 522 | padding-top: 0.5em; |
| 523 | padding-bottom: 0.5em; |
| 524 | border-top: 2px solid silver; |
| 525 | border-bottom: 2px solid silver; |
| 526 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 527 | body.manpage h2 { |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 528 | border-style: none; |
| 529 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 530 | body.manpage div.sectionbody { |
| 531 | margin-left: 3em; |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 532 | } |
| 533 | |
| 534 | @media print { |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 535 | body.manpage div#toc { display: none; } |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 536 | } |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 537 | |
| 538 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 539 | </style> |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 540 | <script type="text/javascript"> |
| 541 | /*<![CDATA[*/ |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 542 | var 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. |
| 562 | toc: 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 Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 583 | var re = new RegExp('[hH]([1-'+(toclevels+1)+'])'); |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 584 | // 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 Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 603 | 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 Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 612 | if (entry.nodeName.toLowerCase() == 'div' |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 613 | && 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 Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 622 | 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 | |
| 648 | footnotes: function () { |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 649 | // Delete existing footnote entries in case we're reloading the footnodes. |
| 650 | var i; |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 651 | var noteholder = document.getElementById("footnotes"); |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 652 | 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 Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 658 | if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 659 | 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 Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 667 | 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 Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 673 | 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 Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 683 | 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 Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 687 | 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 Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 706 | }, |
| 707 | |
| 708 | install: 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 Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 728 | } |
| 729 | |
| 730 | } |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 731 | asciidoc.install(); |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 732 | /*]]>*/ |
| 733 | </script> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 734 | </head> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 735 | <body class="manpage"> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 736 | <div id="header"> |
| 737 | <h1> |
| 738 | git-branch(1) Manual Page |
| 739 | </h1> |
| 740 | <h2>NAME</h2> |
| 741 | <div class="sectionbody"> |
| 742 | <p>git-branch - |
Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 743 | List, create, or delete branches |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 744 | </p> |
| 745 | </div> |
| 746 | </div> |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 747 | <div id="content"> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 748 | <div class="sect1"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 749 | <h2 id="_synopsis">SYNOPSIS</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 750 | <div class="sectionbody"> |
Junio C Hamano | 2b13527 | 2006-03-18 07:45:42 | [diff] [blame] | 751 | <div class="verseblock"> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 752 | <pre class="content"><em>git branch</em> [--color[=<when>] | --no-color] [-r | -a] |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 753 | [--list] [-v [--abbrev=<length> | --no-abbrev]] |
Junio C Hamano | 59a5f53 | 2017-04-11 08:38:02 | [diff] [blame] | 754 | [--column[=<options>] | --no-column] [--sort=<key>] |
| 755 | [(--merged | --no-merged) [<commit>]] |
| 756 | [--contains [<commit]] [--no-contains [<commit>]] |
Junio C Hamano | cbe0eb2 | 2017-02-27 23:37:49 | [diff] [blame] | 757 | [--points-at <object>] [--format=<format>] [<pattern>…] |
Junio C Hamano | 912712b | 2017-12-06 18:04:01 | [diff] [blame] | 758 | <em>git branch</em> [--track | --no-track] [-l] [-f] <branchname> [<start-point>] |
Junio C Hamano | eccdd4a | 2012-09-10 23:28:17 | [diff] [blame] | 759 | <em>git branch</em> (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>] |
| 760 | <em>git branch</em> --unset-upstream [<branchname>] |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 761 | <em>git branch</em> (-m | -M) [<oldbranch>] <newbranch> |
Junio C Hamano | 139b7d1 | 2017-10-03 07:10:59 | [diff] [blame] | 762 | <em>git branch</em> (-c | -C) [<oldbranch>] <newbranch> |
Junio C Hamano | 515ab1d | 2011-12-09 23:41:20 | [diff] [blame] | 763 | <em>git branch</em> (-d | -D) [-r] <branchname>… |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 764 | <em>git branch</em> --edit-description [<branchname>]</pre> |
| 765 | <div class="attribution"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 766 | </div></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 767 | </div> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 768 | </div> |
| 769 | <div class="sect1"> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 770 | <h2 id="_description">DESCRIPTION</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 771 | <div class="sectionbody"> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 772 | <div class="paragraph"><p>If <code>--list</code> is given, or if there are no non-option arguments, existing |
Junio C Hamano | b5e079f | 2013-02-08 00:02:52 | [diff] [blame] | 773 | branches are listed; the current branch will be highlighted with an |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 774 | asterisk. Option <code>-r</code> causes the remote-tracking branches to be listed, |
| 775 | and option <code>-a</code> shows both local and remote branches. If a <code><pattern></code> |
Junio C Hamano | b5e079f | 2013-02-08 00:02:52 | [diff] [blame] | 776 | is given, it is used as a shell wildcard to restrict the output to |
| 777 | matching branches. If multiple patterns are given, a branch is shown if |
| 778 | it matches any of the patterns. Note that when providing a |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 779 | <code><pattern></code>, you must use <code>--list</code>; otherwise the command is interpreted |
Junio C Hamano | b5e079f | 2013-02-08 00:02:52 | [diff] [blame] | 780 | as branch creation.</p></div> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 781 | <div class="paragraph"><p>With <code>--contains</code>, shows only the branches that contain the named commit |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 782 | (in other words, the branches whose tip commits are descendants of the |
Junio C Hamano | 59a5f53 | 2017-04-11 08:38:02 | [diff] [blame] | 783 | named commit), <code>--no-contains</code> inverts it. With <code>--merged</code>, only branches |
| 784 | merged into the named commit (i.e. the branches whose tip commits are |
| 785 | reachable from the named commit) will be listed. With <code>--no-merged</code> only |
| 786 | branches not merged into the named commit will be listed. If the <commit> |
| 787 | argument is missing it defaults to <code>HEAD</code> (i.e. the tip of the current |
| 788 | branch).</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 789 | <div class="paragraph"><p>The command’s second form creates a new branch head named <branchname> |
Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 790 | which points to the current <code>HEAD</code>, or <start-point> if given.</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 791 | <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] | 792 | working tree to it; use "git checkout <newbranch>" to switch to the |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 793 | new branch.</p></div> |
Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 794 | <div class="paragraph"><p>When a local branch is started off a remote-tracking branch, Git sets up the |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 795 | branch (specifically the <code>branch.<name>.remote</code> and <code>branch.<name>.merge</code> |
Junio C Hamano | 79f4c7c | 2013-09-20 21:03:37 | [diff] [blame] | 796 | configuration entries) so that <em>git pull</em> will appropriately merge from |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 797 | the remote-tracking branch. This behavior may be changed via the global |
Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 798 | <code>branch.autoSetupMerge</code> configuration flag. That setting can be |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 799 | overridden by using the <code>--track</code> and <code>--no-track</code> options, and |
| 800 | changed 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, <oldbranch> will be renamed to <newbranch>. |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 802 | If <oldbranch> had a corresponding reflog, it is renamed to match |
| 803 | <newbranch>, and a reflog entry is created to remember the branch |
| 804 | renaming. If <newbranch> exists, -M must be used to force the rename |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 805 | to happen.</p></div> |
Junio C Hamano | 139b7d1 | 2017-10-03 07:10:59 | [diff] [blame] | 806 | <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 |
| 808 | config and reflog will be copied to a new name.</p></div> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 809 | <div class="paragraph"><p>With a <code>-d</code> or <code>-D</code> option, <code><branchname></code> will be deleted. You may |
Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 810 | specify more than one branch for deletion. If the branch currently |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 811 | has a reflog then the reflog will also be deleted.</p></div> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 812 | <div class="paragraph"><p>Use <code>-r</code> together with <code>-d</code> to delete remote-tracking branches. Note, that it |
Junio C Hamano | 258e441 | 2007-11-29 02:28:32 | [diff] [blame] | 813 | 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] | 814 | 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] | 815 | 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] | 816 | way to clean up all obsolete remote-tracking branches.</p></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 817 | </div> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 818 | </div> |
| 819 | <div class="sect1"> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 820 | <h2 id="_options">OPTIONS</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 821 | <div class="sectionbody"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 822 | <div class="dlist"><dl> |
| 823 | <dt class="hdlist1"> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 824 | -d |
| 825 | </dt> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 826 | <dt class="hdlist1"> |
| 827 | --delete |
| 828 | </dt> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 829 | <dd> |
| 830 | <p> |
Junio C Hamano | d965706 | 2010-04-18 00:01:03 | [diff] [blame] | 831 | Delete a branch. The branch must be fully merged in its |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 832 | upstream branch, or in <code>HEAD</code> if no upstream was set with |
Junio C Hamano | 912712b | 2017-12-06 18:04:01 | [diff] [blame] | 833 | <code>--track</code> or <code>--set-upstream-to</code>. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 834 | </p> |
| 835 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 836 | <dt class="hdlist1"> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 837 | -D |
| 838 | </dt> |
| 839 | <dd> |
| 840 | <p> |
Junio C Hamano | 823eebb | 2015-07-10 22:29:34 | [diff] [blame] | 841 | Shortcut for <code>--delete --force</code>. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 842 | </p> |
| 843 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 844 | <dt class="hdlist1"> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 845 | --create-reflog |
| 846 | </dt> |
Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 847 | <dd> |
| 848 | <p> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 849 | Create the branch’s reflog. This activates recording of |
Junio C Hamano | 1d90cb0 | 2007-07-03 07:05:31 | [diff] [blame] | 850 | all changes made to the branch ref, enabling use of date |
| 851 | based sha1 expressions such as "<branchname>@{yesterday}". |
Junio C Hamano | e749562 | 2010-04-09 07:18:35 | [diff] [blame] | 852 | Note that in non-bare repositories, reflogs are usually |
Junio C Hamano | f088858 | 2017-09-28 06:34:39 | [diff] [blame] | 853 | enabled by default by the <code>core.logAllRefUpdates</code> config option. |
Junio C Hamano | a8e4261 | 2017-02-03 21:44:07 | [diff] [blame] | 854 | 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 Hamano | f088858 | 2017-09-28 06:34:39 | [diff] [blame] | 856 | <code>core.logAllRefUpdates</code>. |
Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 857 | </p> |
Junio C Hamano | ea1ac8d | 2018-07-18 20:16:48 | [diff] [blame] | 858 | <div class="paragraph"><p>The <code>-l</code> option is a deprecated synonym for <code>--create-reflog</code>.</p></div> |
Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 859 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 860 | <dt class="hdlist1"> |
Junio C Hamano | 560a1f6 | 2006-01-30 04:19:57 | [diff] [blame] | 861 | -f |
| 862 | </dt> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 863 | <dt class="hdlist1"> |
Junio C Hamano | 68cfa3a | 2009-08-30 00:22:55 | [diff] [blame] | 864 | --force |
| 865 | </dt> |
Junio C Hamano | 560a1f6 | 2006-01-30 04:19:57 | [diff] [blame] | 866 | <dd> |
| 867 | <p> |
Junio C Hamano | f7e3f47 | 2017-10-20 06:45:24 | [diff] [blame] | 868 | Reset <branchname> to <startpoint>, even if <branchname> exists |
| 869 | already. Without <code>-f</code>, <em>git branch</em> refuses to change an existing branch. |
Junio C Hamano | 823eebb | 2015-07-10 22:29:34 | [diff] [blame] | 870 | 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 Hamano | 139b7d1 | 2017-10-03 07:10:59 | [diff] [blame] | 873 | branch name already exists, the same applies for <code>-c</code> (or <code>--copy</code>). |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 874 | </p> |
| 875 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 876 | <dt class="hdlist1"> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 877 | -m |
| 878 | </dt> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 879 | <dt class="hdlist1"> |
| 880 | --move |
| 881 | </dt> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 882 | <dd> |
| 883 | <p> |
| 884 | Move/rename a branch and the corresponding reflog. |
| 885 | </p> |
| 886 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 887 | <dt class="hdlist1"> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 888 | -M |
| 889 | </dt> |
| 890 | <dd> |
| 891 | <p> |
Junio C Hamano | 823eebb | 2015-07-10 22:29:34 | [diff] [blame] | 892 | Shortcut for <code>--move --force</code>. |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 893 | </p> |
| 894 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 895 | <dt class="hdlist1"> |
Junio C Hamano | 139b7d1 | 2017-10-03 07:10:59 | [diff] [blame] | 896 | -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 Hamano | 4aa0bcc | 2010-03-03 05:13:12 | [diff] [blame] | 915 | --color[=<when>] |
Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 916 | </dt> |
| 917 | <dd> |
| 918 | <p> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 919 | Color branches to highlight current, local, and |
| 920 | remote-tracking branches. |
Junio C Hamano | 4aa0bcc | 2010-03-03 05:13:12 | [diff] [blame] | 921 | The value must be always (the default), never, or auto. |
Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 922 | </p> |
| 923 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 924 | <dt class="hdlist1"> |
Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 925 | --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 Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 931 | Same as <code>--color=never</code>. |
Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 932 | </p> |
| 933 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 934 | <dt class="hdlist1"> |
Junio C Hamano | 52b1cfb | 2016-12-20 00:18:36 | [diff] [blame] | 935 | -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 Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 946 | --column[=<options>] |
| 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 Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 954 | column.branch for option syntax.<code>--column</code> and <code>--no-column</code> |
Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 955 | 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 Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 960 | -r |
| 961 | </dt> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 962 | <dt class="hdlist1"> |
| 963 | --remotes |
| 964 | </dt> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 965 | <dd> |
| 966 | <p> |
Junio C Hamano | 63ef0ac | 2006-12-22 07:28:18 | [diff] [blame] | 967 | List or delete (if used with -d) the remote-tracking branches. |
Junio C Hamano | fe9acab | 2006-11-24 12:10:55 | [diff] [blame] | 968 | </p> |
| 969 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 970 | <dt class="hdlist1"> |
Junio C Hamano | fe9acab | 2006-11-24 12:10:55 | [diff] [blame] | 971 | -a |
| 972 | </dt> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 973 | <dt class="hdlist1"> |
| 974 | --all |
| 975 | </dt> |
Junio C Hamano | fe9acab | 2006-11-24 12:10:55 | [diff] [blame] | 976 | <dd> |
| 977 | <p> |
| 978 | List both remote-tracking branches and local branches. |
Junio C Hamano | 560a1f6 | 2006-01-30 04:19:57 | [diff] [blame] | 979 | </p> |
| 980 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 981 | <dt class="hdlist1"> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 982 | --list |
| 983 | </dt> |
| 984 | <dd> |
| 985 | <p> |
Junio C Hamano | 2affb96 | 2017-03-28 22:01:40 | [diff] [blame] | 986 | List branches. With optional <code><pattern>...</code>, e.g. <code>git |
| 987 | branch --list 'maint-*'</code>, list only the branches that match |
| 988 | the pattern(s). |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 989 | </p> |
Junio C Hamano | 2affb96 | 2017-03-28 22:01:40 | [diff] [blame] | 990 | <div class="paragraph"><p>This should not be confused with <code>git branch -l <branchname></code>, |
| 991 | which creates a branch named <code><branchname></code> with a reflog. |
| 992 | See <code>--create-reflog</code> above for details.</p></div> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 993 | </dd> |
| 994 | <dt class="hdlist1"> |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 995 | -v |
| 996 | </dt> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 997 | <dt class="hdlist1"> |
Junio C Hamano | 4f07aec | 2012-09-25 19:08:44 | [diff] [blame] | 998 | -vv |
| 999 | </dt> |
| 1000 | <dt class="hdlist1"> |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1001 | --verbose |
Junio C Hamano | 53edd07 | 2006-11-25 10:05:21 | [diff] [blame] | 1002 | </dt> |
| 1003 | <dd> |
| 1004 | <p> |
Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 1005 | When in list mode, |
| 1006 | show sha1 and commit subject line for each head, along with |
Junio C Hamano | 98e32c3 | 2009-04-13 02:39:53 | [diff] [blame] | 1007 | relationship to upstream branch (if any). If given twice, print |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1008 | the name of the upstream branch, as well (see also <code>git remote |
| 1009 | show <remote></code>). |
Junio C Hamano | 53edd07 | 2006-11-25 10:05:21 | [diff] [blame] | 1010 | </p> |
| 1011 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1012 | <dt class="hdlist1"> |
Junio C Hamano | 51f87de | 2012-04-16 21:18:54 | [diff] [blame] | 1013 | -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 Hamano | 53edd07 | 2006-11-25 10:05:21 | [diff] [blame] | 1025 | --abbrev=<length> |
| 1026 | </dt> |
| 1027 | <dd> |
| 1028 | <p> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1029 | Alter the sha1’s minimum display length in the output listing. |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1030 | The default value is 7 and can be overridden by the <code>core.abbrev</code> |
Junio C Hamano | 6e41cb3 | 2011-08-29 07:12:49 | [diff] [blame] | 1031 | config option. |
Junio C Hamano | 53edd07 | 2006-11-25 10:05:21 | [diff] [blame] | 1032 | </p> |
| 1033 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1034 | <dt class="hdlist1"> |
Junio C Hamano | a3fccdf | 2007-03-03 05:18:26 | [diff] [blame] | 1035 | --no-abbrev |
| 1036 | </dt> |
| 1037 | <dd> |
| 1038 | <p> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 1039 | Display the full sha1s in the output listing rather than abbreviating them. |
Junio C Hamano | a3fccdf | 2007-03-03 05:18:26 | [diff] [blame] | 1040 | </p> |
| 1041 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1042 | <dt class="hdlist1"> |
Junio C Hamano | 89bdb3b | 2009-05-10 06:48:14 | [diff] [blame] | 1043 | -t |
| 1044 | </dt> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1045 | <dt class="hdlist1"> |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 1046 | --track |
| 1047 | </dt> |
| 1048 | <dd> |
| 1049 | <p> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1050 | When creating a new branch, set up <code>branch.<name>.remote</code> and |
| 1051 | <code>branch.<name>.merge</code> configuration entries to mark the |
Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 1052 | start-point branch as "upstream" from the new branch. This |
| 1053 | configuration will tell git to show the relationship between the |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1054 | 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 Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 1056 | upstream when the new branch is checked out. |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 1057 | </p> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1058 | <div class="paragraph"><p>This behavior is the default when the start point is a remote-tracking branch. |
Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1059 | Set the branch.autoSetupMerge configuration variable to <code>false</code> if you |
Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 1060 | want <code>git checkout</code> and <code>git branch</code> to always behave as if <code>--no-track</code> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1061 | were given. Set it to <code>always</code> if you want this behavior when the |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1062 | start-point is either a local or remote-tracking branch.</p></div> |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 1063 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1064 | <dt class="hdlist1"> |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 1065 | --no-track |
| 1066 | </dt> |
| 1067 | <dd> |
| 1068 | <p> |
Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 1069 | Do not set up "upstream" configuration, even if the |
Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1070 | branch.autoSetupMerge configuration variable is true. |
Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 1071 | </p> |
| 1072 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1073 | <dt class="hdlist1"> |
Junio C Hamano | 57827fb | 2010-01-23 03:02:50 | [diff] [blame] | 1074 | --set-upstream |
| 1075 | </dt> |
| 1076 | <dd> |
| 1077 | <p> |
Junio C Hamano | bc39b7d | 2017-09-06 04:37:23 | [diff] [blame] | 1078 | 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 Hamano | 57827fb | 2010-01-23 03:02:50 | [diff] [blame] | 1080 | </p> |
| 1081 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1082 | <dt class="hdlist1"> |
Junio C Hamano | eccdd4a | 2012-09-10 23:28:17 | [diff] [blame] | 1083 | -u <upstream> |
| 1084 | </dt> |
| 1085 | <dt class="hdlist1"> |
| 1086 | --set-upstream-to=<upstream> |
| 1087 | </dt> |
| 1088 | <dd> |
| 1089 | <p> |
| 1090 | Set up <branchname>'s tracking information so <upstream> is |
| 1091 | considered <branchname>'s upstream branch. If no <branchname> |
| 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 <branchname>. If no branch |
| 1101 | is specified it defaults to the current branch. |
| 1102 | </p> |
| 1103 | </dd> |
| 1104 | <dt class="hdlist1"> |
Junio C Hamano | 515ab1d | 2011-12-09 23:41:20 | [diff] [blame] | 1105 | --edit-description |
| 1106 | </dt> |
| 1107 | <dd> |
| 1108 | <p> |
| 1109 | Open an editor and edit the text to explain what the branch is |
Junio C Hamano | 7db630e | 2015-09-17 20:26:22 | [diff] [blame] | 1110 | 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 Hamano | 515ab1d | 2011-12-09 23:41:20 | [diff] [blame] | 1113 | </p> |
| 1114 | </dd> |
| 1115 | <dt class="hdlist1"> |
Junio C Hamano | cae88e2 | 2012-03-09 00:13:20 | [diff] [blame] | 1116 | --contains [<commit>] |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1117 | </dt> |
| 1118 | <dd> |
| 1119 | <p> |
Junio C Hamano | cae88e2 | 2012-03-09 00:13:20 | [diff] [blame] | 1120 | Only list branches which contain the specified commit (HEAD |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1121 | if not specified). Implies <code>--list</code>. |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1122 | </p> |
| 1123 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1124 | <dt class="hdlist1"> |
Junio C Hamano | 59a5f53 | 2017-04-11 08:38:02 | [diff] [blame] | 1125 | --no-contains [<commit>] |
| 1126 | </dt> |
| 1127 | <dd> |
| 1128 | <p> |
| 1129 | Only list branches which don’t contain the specified commit |
| 1130 | (HEAD if not specified). Implies <code>--list</code>. |
| 1131 | </p> |
| 1132 | </dd> |
| 1133 | <dt class="hdlist1"> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 1134 | --merged [<commit>] |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1135 | </dt> |
| 1136 | <dd> |
| 1137 | <p> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 1138 | Only list branches whose tips are reachable from the |
Junio C Hamano | 59a5f53 | 2017-04-11 08:38:02 | [diff] [blame] | 1139 | specified commit (HEAD if not specified). Implies <code>--list</code>, |
| 1140 | incompatible with <code>--no-merged</code>. |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1141 | </p> |
| 1142 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1143 | <dt class="hdlist1"> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 1144 | --no-merged [<commit>] |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1145 | </dt> |
| 1146 | <dd> |
| 1147 | <p> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 1148 | Only list branches whose tips are not reachable from the |
Junio C Hamano | 59a5f53 | 2017-04-11 08:38:02 | [diff] [blame] | 1149 | specified commit (HEAD if not specified). Implies <code>--list</code>, |
| 1150 | incompatible with <code>--merged</code>. |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1151 | </p> |
| 1152 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1153 | <dt class="hdlist1"> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1154 | <branchname> |
| 1155 | </dt> |
| 1156 | <dd> |
| 1157 | <p> |
| 1158 | The name of the branch to create or delete. |
Junio C Hamano | b2f5edd | 2006-05-21 10:50:09 | [diff] [blame] | 1159 | The new branch name must pass all checks defined by |
Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1160 | <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] | 1161 | may restrict the characters allowed in a branch name. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1162 | </p> |
| 1163 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1164 | <dt class="hdlist1"> |
Junio C Hamano | 560a1f6 | 2006-01-30 04:19:57 | [diff] [blame] | 1165 | <start-point> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1166 | </dt> |
| 1167 | <dd> |
| 1168 | <p> |
Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 1169 | 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 Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1172 | </p> |
| 1173 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1174 | <dt class="hdlist1"> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1175 | <oldbranch> |
| 1176 | </dt> |
| 1177 | <dd> |
| 1178 | <p> |
| 1179 | The name of an existing branch to rename. |
| 1180 | </p> |
| 1181 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1182 | <dt class="hdlist1"> |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1183 | <newbranch> |
| 1184 | </dt> |
| 1185 | <dd> |
| 1186 | <p> |
| 1187 | The new name for an existing branch. The same restrictions as for |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 1188 | <branchname> apply. |
Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1189 | </p> |
| 1190 | </dd> |
Junio C Hamano | b0a1e83 | 2015-10-15 23:08:31 | [diff] [blame] | 1191 | <dt class="hdlist1"> |
| 1192 | --sort=<key> |
| 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=<key> 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 <object> |
| 1208 | </dt> |
| 1209 | <dd> |
| 1210 | <p> |
| 1211 | Only list branches of the given object. |
| 1212 | </p> |
| 1213 | </dd> |
Junio C Hamano | cbe0eb2 | 2017-02-27 23:37:49 | [diff] [blame] | 1214 | <dt class="hdlist1"> |
| 1215 | --format <format> |
| 1216 | </dt> |
| 1217 | <dd> |
| 1218 | <p> |
Junio C Hamano | a4ff729 | 2017-08-23 21:56:43 | [diff] [blame] | 1219 | 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 Hamano | cbe0eb2 | 2017-02-27 23:37:49 | [diff] [blame] | 1221 | that of <a href="git-for-each-ref.html">git-for-each-ref(1)</a>. |
| 1222 | </p> |
| 1223 | </dd> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1224 | </dl></div> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1225 | </div> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1226 | </div> |
| 1227 | <div class="sect1"> |
Junio C Hamano | 7da67f7 | 2017-11-29 01:12:47 | [diff] [blame] | 1228 | <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. |
| 1232 | See <a href="git-config.html">git-config(1)</a>.</p></div> |
| 1233 | </div> |
| 1234 | </div> |
| 1235 | <div class="sect1"> |
Junio C Hamano | b9d9d90 | 2018-05-23 07:07:42 | [diff] [blame] | 1236 | <h2 id="_examples">EXAMPLES</h2> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1237 | <div class="sectionbody"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1238 | <div class="dlist"><dl> |
| 1239 | <dt class="hdlist1"> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 1240 | Start development from a known tag |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1241 | </dt> |
| 1242 | <dd> |
| 1243 | <div class="listingblock"> |
| 1244 | <div class="content"> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1245 | <pre><code>$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6 |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1246 | $ cd my2.6 |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1247 | $ git branch my2.6.14 v2.6.14 <b><1></b> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1248 | $ git checkout my2.6.14</code></pre> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1249 | </div></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1250 | <div class="colist arabic"><ol> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1251 | <li> |
| 1252 | <p> |
| 1253 | This 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 Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1257 | </ol></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1258 | </dd> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1259 | <dt class="hdlist1"> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 1260 | Delete an unneeded branch |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1261 | </dt> |
| 1262 | <dd> |
| 1263 | <div class="listingblock"> |
| 1264 | <div class="content"> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1265 | <pre><code>$ git clone git://git.kernel.org/.../git.git my.git |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1266 | $ cd my.git |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1267 | $ git branch -d -r origin/todo origin/html origin/man <b><1></b> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1268 | $ git branch -D test <b><2></b></code></pre> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1269 | </div></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1270 | <div class="colist arabic"><ol> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1271 | <li> |
| 1272 | <p> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 1273 | Delete 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 Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1275 | See <a href="git-fetch.html">git-fetch(1)</a>. |
Junio C Hamano | 63ef0ac | 2006-12-22 07:28:18 | [diff] [blame] | 1276 | </p> |
| 1277 | </li> |
| 1278 | <li> |
| 1279 | <p> |
Junio C Hamano | fd83b8e | 2009-03-22 08:21:41 | [diff] [blame] | 1280 | Delete the "test" branch even if the "master" branch (or whichever branch |
| 1281 | 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] | 1282 | </p> |
| 1283 | </li> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1284 | </ol></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1285 | </dd> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1286 | </dl></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1287 | </div> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1288 | </div> |
| 1289 | <div class="sect1"> |
Junio C Hamano | b9d9d90 | 2018-05-23 07:07:42 | [diff] [blame] | 1290 | <h2 id="_notes">NOTES</h2> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1291 | <div class="sectionbody"> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1292 | <div class="paragraph"><p>If you are creating a branch that you want to checkout immediately, it is |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1293 | easier to use the git checkout command with its <code>-b</code> option to create |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1294 | a branch and check it out with a single command.</p></div> |
Junio C Hamano | 59a5f53 | 2017-04-11 08:38:02 | [diff] [blame] | 1295 | <div class="paragraph"><p>The options <code>--contains</code>, <code>--no-contains</code>, <code>--merged</code> and <code>--no-merged</code> |
| 1296 | serve four related but different purposes:</p></div> |
Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1297 | <div class="ulist"><ul> |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1298 | <li> |
| 1299 | <p> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1300 | <code>--contains <commit></code> is used to find all branches which will need |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1301 | special attention if <commit> were to be rebased or amended, since those |
| 1302 | branches contain the specified <commit>. |
| 1303 | </p> |
| 1304 | </li> |
| 1305 | <li> |
| 1306 | <p> |
Junio C Hamano | 59a5f53 | 2017-04-11 08:38:02 | [diff] [blame] | 1307 | <code>--no-contains <commit></code> is the inverse of that, i.e. branches that don’t |
| 1308 | contain the specified <commit>. |
| 1309 | </p> |
| 1310 | </li> |
| 1311 | <li> |
| 1312 | <p> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1313 | <code>--merged</code> is used to find all branches which can be safely deleted, |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1314 | since those branches are fully contained by HEAD. |
| 1315 | </p> |
| 1316 | </li> |
| 1317 | <li> |
| 1318 | <p> |
Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1319 | <code>--no-merged</code> is used to find branches which are candidates for merging |
Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 1320 | into HEAD, since those branches are not fully contained by HEAD. |
| 1321 | </p> |
| 1322 | </li> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1323 | </ul></div> |
Junio C Hamano | c8d88c2 | 2006-04-29 07:02:01 | [diff] [blame] | 1324 | </div> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1325 | </div> |
| 1326 | <div class="sect1"> |
Junio C Hamano | c276ec7 | 2009-08-26 01:35:22 | [diff] [blame] | 1327 | <h2 id="_see_also">SEE ALSO</h2> |
| 1328 | <div class="sectionbody"> |
Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1329 | <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 Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 1332 | <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] | 1333 | a branch?”</a> in the Git User’s Manual.</p></div> |
Junio C Hamano | c276ec7 | 2009-08-26 01:35:22 | [diff] [blame] | 1334 | </div> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1335 | </div> |
| 1336 | <div class="sect1"> |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1337 | <h2 id="_git">GIT</h2> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1338 | <div class="sectionbody"> |
Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1339 | <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] | 1340 | </div> |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 1341 | </div> |
Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1342 | </div> |
Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 1343 | <div id="footnotes"><hr /></div> |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1344 | <div id="footer"> |
| 1345 | <div id="footer-text"> |
Junio C Hamano | 2ef0ba3 | 2018-01-26 23:13:53 | [diff] [blame] | 1346 | Last updated |
Junio C Hamano | ea1ac8d | 2018-07-18 20:16:48 | [diff] [blame] | 1347 | 2018-07-18 13:16:04 PDT |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1348 | </div> |
| 1349 | </div> |
| 1350 | </body> |
| 1351 | </html> |