| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" |
| 2 | "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
| 3 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> |
| 4 | <head> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 5 | <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 6 | <meta name="generator" content="AsciiDoc 8.6.9" /> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 7 | <title>git-commit(1)</title> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 8 | <style type="text/css"> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 9 | /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ |
| 10 | |
| 11 | /* Default font. */ |
| 12 | body { |
| 13 | font-family: Georgia,serif; |
| 14 | } |
| 15 | |
| 16 | /* Title font. */ |
| 17 | h1, h2, h3, h4, h5, h6, |
| 18 | div.title, caption.title, |
| 19 | thead, p.table.header, |
| 20 | #toctitle, |
| 21 | #author, #revnumber, #revdate, #revremark, |
| 22 | #footer { |
| 23 | font-family: Arial,Helvetica,sans-serif; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 24 | } |
| 25 | |
| 26 | body { |
| 27 | margin: 1em 5% 1em 5%; |
| 28 | } |
| 29 | |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 30 | a { |
| 31 | color: blue; |
| 32 | text-decoration: underline; |
| 33 | } |
| 34 | a:visited { |
| 35 | color: fuchsia; |
| 36 | } |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 37 | |
| 38 | em { |
| 39 | font-style: italic; |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 40 | color: navy; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 41 | } |
| 42 | |
| 43 | strong { |
| 44 | font-weight: bold; |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 45 | color: #083194; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 46 | } |
| 47 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 48 | h1, h2, h3, h4, h5, h6 { |
| 49 | color: #527bbd; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 50 | margin-top: 1.2em; |
| 51 | margin-bottom: 0.5em; |
| 52 | line-height: 1.3; |
| 53 | } |
| 54 | |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 55 | h1, h2, h3 { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 56 | border-bottom: 2px solid silver; |
| 57 | } |
| 58 | h2 { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 59 | padding-top: 0.5em; |
| 60 | } |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 61 | h3 { |
| 62 | float: left; |
| 63 | } |
| 64 | h3 + * { |
| 65 | clear: left; |
| 66 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 67 | h5 { |
| 68 | font-size: 1.0em; |
| 69 | } |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 70 | |
| 71 | div.sectionbody { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 72 | margin-left: 0; |
| 73 | } |
| 74 | |
| 75 | hr { |
| 76 | border: 1px solid silver; |
| 77 | } |
| 78 | |
| 79 | p { |
| 80 | margin-top: 0.5em; |
| 81 | margin-bottom: 0.5em; |
| 82 | } |
| 83 | |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 84 | ul, ol, li > p { |
| 85 | margin-top: 0; |
| 86 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 87 | ul > li { color: #aaa; } |
| 88 | ul > li > * { color: black; } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 89 | |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 90 | .monospaced, code, pre { |
| 91 | font-family: "Courier New", Courier, monospace; |
| 92 | font-size: inherit; |
| 93 | color: navy; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 94 | padding: 0; |
| 95 | margin: 0; |
| 96 | } |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 97 | pre { |
| 98 | white-space: pre-wrap; |
| 99 | } |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 100 | |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 101 | #author { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 102 | color: #527bbd; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 103 | font-weight: bold; |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 104 | font-size: 1.1em; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 105 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 106 | #email { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 107 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 108 | #revnumber, #revdate, #revremark { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 109 | } |
| 110 | |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 111 | #footer { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 112 | font-size: small; |
| 113 | border-top: 2px solid silver; |
| 114 | padding-top: 0.5em; |
| 115 | margin-top: 4.0em; |
| 116 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 117 | #footer-text { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 118 | float: left; |
| 119 | padding-bottom: 0.5em; |
| 120 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 121 | #footer-badges { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 122 | float: right; |
| 123 | padding-bottom: 0.5em; |
| 124 | } |
| 125 | |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 126 | #preamble { |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 127 | margin-top: 1.5em; |
| 128 | margin-bottom: 1.5em; |
| 129 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 130 | div.imageblock, div.exampleblock, div.verseblock, |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 131 | div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, |
| 132 | div.admonitionblock { |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 133 | margin-top: 1.0em; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 134 | margin-bottom: 1.5em; |
| 135 | } |
| 136 | div.admonitionblock { |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 137 | margin-top: 2.0em; |
| 138 | margin-bottom: 2.0em; |
| 139 | margin-right: 10%; |
| 140 | color: #606060; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 141 | } |
| 142 | |
| 143 | div.content { /* Block element content. */ |
| 144 | padding: 0; |
| 145 | } |
| 146 | |
| 147 | /* Block element titles. */ |
| 148 | div.title, caption.title { |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 149 | color: #527bbd; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 150 | font-weight: bold; |
| 151 | text-align: left; |
| 152 | margin-top: 1.0em; |
| 153 | margin-bottom: 0.5em; |
| 154 | } |
| 155 | div.title + * { |
| 156 | margin-top: 0; |
| 157 | } |
| 158 | |
| 159 | td div.title:first-child { |
| 160 | margin-top: 0.0em; |
| 161 | } |
| 162 | div.content div.title:first-child { |
| 163 | margin-top: 0.0em; |
| 164 | } |
| 165 | div.content + div.title { |
| 166 | margin-top: 0.0em; |
| 167 | } |
| 168 | |
| 169 | div.sidebarblock > div.content { |
| 170 | background: #ffffee; |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 171 | border: 1px solid #dddddd; |
| 172 | border-left: 4px solid #f0f0f0; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 173 | padding: 0.5em; |
| 174 | } |
| 175 | |
| 176 | div.listingblock > div.content { |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 177 | border: 1px solid #dddddd; |
| 178 | border-left: 5px solid #f0f0f0; |
| 179 | background: #f8f8f8; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 180 | padding: 0.5em; |
| 181 | } |
| 182 | |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 183 | div.quoteblock, div.verseblock { |
| 184 | padding-left: 1.0em; |
| 185 | margin-left: 1.0em; |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 186 | margin-right: 10%; |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 187 | border-left: 5px solid #f0f0f0; |
| 188 | color: #888; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 189 | } |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 190 | |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 191 | div.quoteblock > div.attribution { |
| 192 | padding-top: 0.5em; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 193 | text-align: right; |
| 194 | } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 195 | |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 196 | div.verseblock > pre.content { |
| 197 | font-family: inherit; |
| 198 | font-size: inherit; |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 199 | } |
| 200 | div.verseblock > div.attribution { |
| 201 | padding-top: 0.75em; |
| 202 | text-align: left; |
| 203 | } |
| 204 | /* DEPRECATED: Pre version 8.2.7 verse style literal block. */ |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 205 | div.verseblock + div.attribution { |
| 206 | text-align: left; |
| 207 | } |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 208 | |
| 209 | div.admonitionblock .icon { |
| 210 | vertical-align: top; |
| 211 | font-size: 1.1em; |
| 212 | font-weight: bold; |
| 213 | text-decoration: underline; |
| 214 | color: #527bbd; |
| 215 | padding-right: 0.5em; |
| 216 | } |
| 217 | div.admonitionblock td.content { |
| 218 | padding-left: 0.5em; |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 219 | border-left: 3px solid #dddddd; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 220 | } |
| 221 | |
| 222 | div.exampleblock > div.content { |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 223 | border-left: 3px solid #dddddd; |
| 224 | padding-left: 0.5em; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 225 | } |
| 226 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 227 | div.imageblock div.content { padding-left: 0; } |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 228 | span.image img { border-style: none; vertical-align: text-bottom; } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 229 | a.image:visited { color: white; } |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 230 | |
| 231 | dl { |
| 232 | margin-top: 0.8em; |
| 233 | margin-bottom: 0.8em; |
| 234 | } |
| 235 | dt { |
| 236 | margin-top: 0.5em; |
| 237 | margin-bottom: 0; |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 238 | font-style: normal; |
| 239 | color: navy; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 240 | } |
| 241 | dd > *:first-child { |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 242 | margin-top: 0.1em; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 243 | } |
| 244 | |
| 245 | ul, ol { |
| 246 | list-style-position: outside; |
| 247 | } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 248 | ol.arabic { |
| 249 | list-style-type: decimal; |
| 250 | } |
| 251 | ol.loweralpha { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 252 | list-style-type: lower-alpha; |
| 253 | } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 254 | ol.upperalpha { |
| 255 | list-style-type: upper-alpha; |
| 256 | } |
| 257 | ol.lowerroman { |
| 258 | list-style-type: lower-roman; |
| 259 | } |
| 260 | ol.upperroman { |
| 261 | list-style-type: upper-roman; |
| 262 | } |
| 263 | |
| 264 | div.compact ul, div.compact ol, |
| 265 | div.compact p, div.compact p, |
| 266 | div.compact div, div.compact div { |
| 267 | margin-top: 0.1em; |
| 268 | margin-bottom: 0.1em; |
| 269 | } |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 270 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 271 | tfoot { |
| 272 | font-weight: bold; |
| 273 | } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 274 | td > div.verse { |
| 275 | white-space: pre; |
| 276 | } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 277 | |
| 278 | div.hdlist { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 279 | margin-top: 0.8em; |
| 280 | margin-bottom: 0.8em; |
| 281 | } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 282 | div.hdlist tr { |
| 283 | padding-bottom: 15px; |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 284 | } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 285 | dt.hdlist1.strong, td.hdlist1.strong { |
| 286 | font-weight: bold; |
| 287 | } |
| 288 | td.hdlist1 { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 289 | vertical-align: top; |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 290 | font-style: normal; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 291 | padding-right: 0.8em; |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 292 | color: navy; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 293 | } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 294 | td.hdlist2 { |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 295 | vertical-align: top; |
| 296 | } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 297 | div.hdlist.compact tr { |
| 298 | margin: 0; |
| 299 | padding-bottom: 0; |
| 300 | } |
| 301 | |
| 302 | .comment { |
| 303 | background: yellow; |
| 304 | } |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 305 | |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 306 | .footnote, .footnoteref { |
| 307 | font-size: 0.8em; |
| 308 | } |
| 309 | |
| 310 | span.footnote, span.footnoteref { |
| 311 | vertical-align: super; |
| 312 | } |
| 313 | |
| 314 | #footnotes { |
| 315 | margin: 20px 0 20px 0; |
| 316 | padding: 7px 0 0 0; |
| 317 | } |
| 318 | |
| 319 | #footnotes div.footnote { |
| 320 | margin: 0 0 5px 0; |
| 321 | } |
| 322 | |
| 323 | #footnotes hr { |
| 324 | border: none; |
| 325 | border-top: 1px solid silver; |
| 326 | height: 1px; |
| 327 | text-align: left; |
| 328 | margin-left: 0; |
| 329 | width: 20%; |
| 330 | min-width: 100px; |
| 331 | } |
| 332 | |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 333 | div.colist td { |
| 334 | padding-right: 0.5em; |
| 335 | padding-bottom: 0.3em; |
| 336 | vertical-align: top; |
| 337 | } |
| 338 | div.colist td img { |
| 339 | margin-top: 0.3em; |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 340 | } |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 341 | |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 342 | @media print { |
| 343 | #footer-badges { display: none; } |
| 344 | } |
| 345 | |
| 346 | #toc { |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 347 | margin-bottom: 2.5em; |
| 348 | } |
| 349 | |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 350 | #toctitle { |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 351 | color: #527bbd; |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 352 | font-size: 1.1em; |
| 353 | font-weight: bold; |
| 354 | margin-top: 1.0em; |
| 355 | margin-bottom: 0.1em; |
| 356 | } |
| 357 | |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 358 | div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 359 | margin-top: 0; |
| 360 | margin-bottom: 0; |
| 361 | } |
| 362 | div.toclevel2 { |
| 363 | margin-left: 2em; |
| 364 | font-size: 0.9em; |
| 365 | } |
| 366 | div.toclevel3 { |
| 367 | margin-left: 4em; |
| 368 | font-size: 0.9em; |
| 369 | } |
| 370 | div.toclevel4 { |
| 371 | margin-left: 6em; |
| 372 | font-size: 0.9em; |
| 373 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 374 | |
| 375 | span.aqua { color: aqua; } |
| 376 | span.black { color: black; } |
| 377 | span.blue { color: blue; } |
| 378 | span.fuchsia { color: fuchsia; } |
| 379 | span.gray { color: gray; } |
| 380 | span.green { color: green; } |
| 381 | span.lime { color: lime; } |
| 382 | span.maroon { color: maroon; } |
| 383 | span.navy { color: navy; } |
| 384 | span.olive { color: olive; } |
| 385 | span.purple { color: purple; } |
| 386 | span.red { color: red; } |
| 387 | span.silver { color: silver; } |
| 388 | span.teal { color: teal; } |
| 389 | span.white { color: white; } |
| 390 | span.yellow { color: yellow; } |
| 391 | |
| 392 | span.aqua-background { background: aqua; } |
| 393 | span.black-background { background: black; } |
| 394 | span.blue-background { background: blue; } |
| 395 | span.fuchsia-background { background: fuchsia; } |
| 396 | span.gray-background { background: gray; } |
| 397 | span.green-background { background: green; } |
| 398 | span.lime-background { background: lime; } |
| 399 | span.maroon-background { background: maroon; } |
| 400 | span.navy-background { background: navy; } |
| 401 | span.olive-background { background: olive; } |
| 402 | span.purple-background { background: purple; } |
| 403 | span.red-background { background: red; } |
| 404 | span.silver-background { background: silver; } |
| 405 | span.teal-background { background: teal; } |
| 406 | span.white-background { background: white; } |
| 407 | span.yellow-background { background: yellow; } |
| 408 | |
| 409 | span.big { font-size: 2em; } |
| 410 | span.small { font-size: 0.6em; } |
| 411 | |
| 412 | span.underline { text-decoration: underline; } |
| 413 | span.overline { text-decoration: overline; } |
| 414 | span.line-through { text-decoration: line-through; } |
| 415 | |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 416 | div.unbreakable { page-break-inside: avoid; } |
| 417 | |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 418 | |
| 419 | /* |
| 420 | * xhtml11 specific |
| 421 | * |
| 422 | * */ |
| 423 | |
| 424 | div.tableblock { |
| 425 | margin-top: 1.0em; |
| 426 | margin-bottom: 1.5em; |
| 427 | } |
| 428 | div.tableblock > table { |
| 429 | border: 3px solid #527bbd; |
| 430 | } |
| 431 | thead, p.table.header { |
| 432 | font-weight: bold; |
| 433 | color: #527bbd; |
| 434 | } |
| 435 | p.table { |
| 436 | margin-top: 0; |
| 437 | } |
| 438 | /* Because the table frame attribute is overriden by CSS in most browsers. */ |
| 439 | div.tableblock > table[frame="void"] { |
| 440 | border-style: none; |
| 441 | } |
| 442 | div.tableblock > table[frame="hsides"] { |
| 443 | border-left-style: none; |
| 444 | border-right-style: none; |
| 445 | } |
| 446 | div.tableblock > table[frame="vsides"] { |
| 447 | border-top-style: none; |
| 448 | border-bottom-style: none; |
| 449 | } |
| 450 | |
| 451 | |
| 452 | /* |
| 453 | * html5 specific |
| 454 | * |
| 455 | * */ |
| 456 | |
| 457 | table.tableblock { |
| 458 | margin-top: 1.0em; |
| 459 | margin-bottom: 1.5em; |
| 460 | } |
| 461 | thead, p.tableblock.header { |
| 462 | font-weight: bold; |
| 463 | color: #527bbd; |
| 464 | } |
| 465 | p.tableblock { |
| 466 | margin-top: 0; |
| 467 | } |
| 468 | table.tableblock { |
| 469 | border-width: 3px; |
| 470 | border-spacing: 0px; |
| 471 | border-style: solid; |
| 472 | border-color: #527bbd; |
| 473 | border-collapse: collapse; |
| 474 | } |
| 475 | th.tableblock, td.tableblock { |
| 476 | border-width: 1px; |
| 477 | padding: 4px; |
| 478 | border-style: solid; |
| 479 | border-color: #527bbd; |
| 480 | } |
| 481 | |
| 482 | table.tableblock.frame-topbot { |
| 483 | border-left-style: hidden; |
| 484 | border-right-style: hidden; |
| 485 | } |
| 486 | table.tableblock.frame-sides { |
| 487 | border-top-style: hidden; |
| 488 | border-bottom-style: hidden; |
| 489 | } |
| 490 | table.tableblock.frame-none { |
| 491 | border-style: hidden; |
| 492 | } |
| 493 | |
| 494 | th.tableblock.halign-left, td.tableblock.halign-left { |
| 495 | text-align: left; |
| 496 | } |
| 497 | th.tableblock.halign-center, td.tableblock.halign-center { |
| 498 | text-align: center; |
| 499 | } |
| 500 | th.tableblock.halign-right, td.tableblock.halign-right { |
| 501 | text-align: right; |
| 502 | } |
| 503 | |
| 504 | th.tableblock.valign-top, td.tableblock.valign-top { |
| 505 | vertical-align: top; |
| 506 | } |
| 507 | th.tableblock.valign-middle, td.tableblock.valign-middle { |
| 508 | vertical-align: middle; |
| 509 | } |
| 510 | th.tableblock.valign-bottom, td.tableblock.valign-bottom { |
| 511 | vertical-align: bottom; |
| 512 | } |
| 513 | |
| 514 | |
| 515 | /* |
| 516 | * manpage specific |
| 517 | * |
| 518 | * */ |
| 519 | |
| 520 | body.manpage h1 { |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 521 | padding-top: 0.5em; |
| 522 | padding-bottom: 0.5em; |
| 523 | border-top: 2px solid silver; |
| 524 | border-bottom: 2px solid silver; |
| 525 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 526 | body.manpage h2 { |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 527 | border-style: none; |
| 528 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 529 | body.manpage div.sectionbody { |
| 530 | margin-left: 3em; |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 531 | } |
| 532 | |
| 533 | @media print { |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 534 | body.manpage div#toc { display: none; } |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 535 | } |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 536 | |
| 537 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 538 | </style> |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 539 | <script type="text/javascript"> |
| 540 | /*<![CDATA[*/ |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 541 | var asciidoc = { // Namespace. |
| 542 | |
| 543 | ///////////////////////////////////////////////////////////////////// |
| 544 | // Table Of Contents generator |
| 545 | ///////////////////////////////////////////////////////////////////// |
| 546 | |
| 547 | /* Author: Mihai Bazon, September 2002 |
| 548 | * http://students.infoiasi.ro/~mishoo |
| 549 | * |
| 550 | * Table Of Content generator |
| 551 | * Version: 0.4 |
| 552 | * |
| 553 | * Feel free to use this script under the terms of the GNU General Public |
| 554 | * License, as long as you do not remove or alter this notice. |
| 555 | */ |
| 556 | |
| 557 | /* modified by Troy D. Hanson, September 2006. License: GPL */ |
| 558 | /* modified by Stuart Rackham, 2006, 2009. License: GPL */ |
| 559 | |
| 560 | // toclevels = 1..4. |
| 561 | toc: function (toclevels) { |
| 562 | |
| 563 | function getText(el) { |
| 564 | var text = ""; |
| 565 | for (var i = el.firstChild; i != null; i = i.nextSibling) { |
| 566 | if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants. |
| 567 | text += i.data; |
| 568 | else if (i.firstChild != null) |
| 569 | text += getText(i); |
| 570 | } |
| 571 | return text; |
| 572 | } |
| 573 | |
| 574 | function TocEntry(el, text, toclevel) { |
| 575 | this.element = el; |
| 576 | this.text = text; |
| 577 | this.toclevel = toclevel; |
| 578 | } |
| 579 | |
| 580 | function tocEntries(el, toclevels) { |
| 581 | var result = new Array; |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 582 | var re = new RegExp('[hH]([1-'+(toclevels+1)+'])'); |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 583 | // Function that scans the DOM tree for header elements (the DOM2 |
| 584 | // nodeIterator API would be a better technique but not supported by all |
| 585 | // browsers). |
| 586 | var iterate = function (el) { |
| 587 | for (var i = el.firstChild; i != null; i = i.nextSibling) { |
| 588 | if (i.nodeType == 1 /* Node.ELEMENT_NODE */) { |
| 589 | var mo = re.exec(i.tagName); |
| 590 | if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") { |
| 591 | result[result.length] = new TocEntry(i, getText(i), mo[1]-1); |
| 592 | } |
| 593 | iterate(i); |
| 594 | } |
| 595 | } |
| 596 | } |
| 597 | iterate(el); |
| 598 | return result; |
| 599 | } |
| 600 | |
| 601 | var toc = document.getElementById("toc"); |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 602 | if (!toc) { |
| 603 | return; |
| 604 | } |
| 605 | |
| 606 | // Delete existing TOC entries in case we're reloading the TOC. |
| 607 | var tocEntriesToRemove = []; |
| 608 | var i; |
| 609 | for (i = 0; i < toc.childNodes.length; i++) { |
| 610 | var entry = toc.childNodes[i]; |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 611 | if (entry.nodeName.toLowerCase() == 'div' |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 612 | && entry.getAttribute("class") |
| 613 | && entry.getAttribute("class").match(/^toclevel/)) |
| 614 | tocEntriesToRemove.push(entry); |
| 615 | } |
| 616 | for (i = 0; i < tocEntriesToRemove.length; i++) { |
| 617 | toc.removeChild(tocEntriesToRemove[i]); |
| 618 | } |
| 619 | |
| 620 | // Rebuild TOC entries. |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 621 | var entries = tocEntries(document.getElementById("content"), toclevels); |
| 622 | for (var i = 0; i < entries.length; ++i) { |
| 623 | var entry = entries[i]; |
| 624 | if (entry.element.id == "") |
| 625 | entry.element.id = "_toc_" + i; |
| 626 | var a = document.createElement("a"); |
| 627 | a.href = "#" + entry.element.id; |
| 628 | a.appendChild(document.createTextNode(entry.text)); |
| 629 | var div = document.createElement("div"); |
| 630 | div.appendChild(a); |
| 631 | div.className = "toclevel" + entry.toclevel; |
| 632 | toc.appendChild(div); |
| 633 | } |
| 634 | if (entries.length == 0) |
| 635 | toc.parentNode.removeChild(toc); |
| 636 | }, |
| 637 | |
| 638 | |
| 639 | ///////////////////////////////////////////////////////////////////// |
| 640 | // Footnotes generator |
| 641 | ///////////////////////////////////////////////////////////////////// |
| 642 | |
| 643 | /* Based on footnote generation code from: |
| 644 | * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html |
| 645 | */ |
| 646 | |
| 647 | footnotes: function () { |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 648 | // Delete existing footnote entries in case we're reloading the footnodes. |
| 649 | var i; |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 650 | var noteholder = document.getElementById("footnotes"); |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 651 | if (!noteholder) { |
| 652 | return; |
| 653 | } |
| 654 | var entriesToRemove = []; |
| 655 | for (i = 0; i < noteholder.childNodes.length; i++) { |
| 656 | var entry = noteholder.childNodes[i]; |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 657 | if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 658 | entriesToRemove.push(entry); |
| 659 | } |
| 660 | for (i = 0; i < entriesToRemove.length; i++) { |
| 661 | noteholder.removeChild(entriesToRemove[i]); |
| 662 | } |
| 663 | |
| 664 | // Rebuild footnote entries. |
| 665 | var cont = document.getElementById("content"); |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 666 | var spans = cont.getElementsByTagName("span"); |
| 667 | var refs = {}; |
| 668 | var n = 0; |
| 669 | for (i=0; i<spans.length; i++) { |
| 670 | if (spans[i].className == "footnote") { |
| 671 | n++; |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 672 | var note = spans[i].getAttribute("data-note"); |
| 673 | if (!note) { |
| 674 | // Use [\s\S] in place of . so multi-line matches work. |
| 675 | // Because JavaScript has no s (dotall) regex flag. |
| 676 | note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1]; |
| 677 | spans[i].innerHTML = |
| 678 | "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n + |
| 679 | "' title='View footnote' class='footnote'>" + n + "</a>]"; |
| 680 | spans[i].setAttribute("data-note", note); |
| 681 | } |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 682 | noteholder.innerHTML += |
| 683 | "<div class='footnote' id='_footnote_" + n + "'>" + |
| 684 | "<a href='#_footnoteref_" + n + "' title='Return to text'>" + |
| 685 | n + "</a>. " + note + "</div>"; |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 686 | var id =spans[i].getAttribute("id"); |
| 687 | if (id != null) refs["#"+id] = n; |
| 688 | } |
| 689 | } |
| 690 | if (n == 0) |
| 691 | noteholder.parentNode.removeChild(noteholder); |
| 692 | else { |
| 693 | // Process footnoterefs. |
| 694 | for (i=0; i<spans.length; i++) { |
| 695 | if (spans[i].className == "footnoteref") { |
| 696 | var href = spans[i].getElementsByTagName("a")[0].getAttribute("href"); |
| 697 | href = href.match(/#.*/)[0]; // Because IE return full URL. |
| 698 | n = refs[href]; |
| 699 | spans[i].innerHTML = |
| 700 | "[<a href='#_footnote_" + n + |
| 701 | "' title='View footnote' class='footnote'>" + n + "</a>]"; |
| 702 | } |
| 703 | } |
| 704 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 705 | }, |
| 706 | |
| 707 | install: function(toclevels) { |
| 708 | var timerId; |
| 709 | |
| 710 | function reinstall() { |
| 711 | asciidoc.footnotes(); |
| 712 | if (toclevels) { |
| 713 | asciidoc.toc(toclevels); |
| 714 | } |
| 715 | } |
| 716 | |
| 717 | function reinstallAndRemoveTimer() { |
| 718 | clearInterval(timerId); |
| 719 | reinstall(); |
| 720 | } |
| 721 | |
| 722 | timerId = setInterval(reinstall, 500); |
| 723 | if (document.addEventListener) |
| 724 | document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false); |
| 725 | else |
| 726 | window.onload = reinstallAndRemoveTimer; |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 727 | } |
| 728 | |
| 729 | } |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 730 | asciidoc.install(); |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 731 | /*]]>*/ |
| 732 | </script> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 733 | </head> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 734 | <body class="manpage"> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 735 | <div id="header"> |
| 736 | <h1> |
| 737 | git-commit(1) Manual Page |
| 738 | </h1> |
| 739 | <h2>NAME</h2> |
| 740 | <div class="sectionbody"> |
| 741 | <p>git-commit - |
| Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 742 | Record changes to the repository |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 743 | </p> |
| 744 | </div> |
| 745 | </div> |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 746 | <div id="content"> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 747 | <div class="sect1"> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 748 | <h2 id="_synopsis">SYNOPSIS</h2> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 749 | <div class="sectionbody"> |
| Junio C Hamano | 235a91e | 2006-01-07 01:13:58 | [diff] [blame] | 750 | <div class="verseblock"> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 751 | <pre class="content"><em>git commit</em> [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend] |
| Junio C Hamano | 3d050d6 | 2011-05-17 06:43:34 | [diff] [blame] | 752 | [--dry-run] [(-c | -C | --fixup | --squash) <commit>] |
| 753 | [-F <file> | -m <msg>] [--reset-author] [--allow-empty] |
| 754 | [--allow-empty-message] [--no-verify] [-e] [--author=<author>] |
| Junio C Hamano | 3d1b5a1 | 2013-05-17 23:34:02 | [diff] [blame] | 755 | [--date=<date>] [--cleanup=<mode>] [--[no-]status] |
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 756 | [-i | -o] [-S[<keyid>]] [--] [<file>…]</pre> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 757 | <div class="attribution"> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 758 | </div></div> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 759 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 760 | </div> |
| 761 | <div class="sect1"> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 762 | <h2 id="_description">DESCRIPTION</h2> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 763 | <div class="sectionbody"> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 764 | <div class="paragraph"><p>Stores the current contents of the index in a new commit along |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 765 | with a log message from the user describing the changes.</p></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 766 | <div class="paragraph"><p>The content to be added can be specified in several ways:</p></div> |
| 767 | <div class="olist arabic"><ol class="arabic"> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 768 | <li> |
| 769 | <p> |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 770 | by using <em>git add</em> to incrementally "add" changes to the |
| Junio C Hamano | b515b6a | 2007-08-08 09:21:16 | [diff] [blame] | 771 | index before using the <em>commit</em> command (Note: even modified |
| 772 | files must be "added"); |
| 773 | </p> |
| 774 | </li> |
| 775 | <li> |
| 776 | <p> |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 777 | by using <em>git rm</em> to remove files from the working tree |
| Junio C Hamano | bd2b4bb | 2007-08-06 06:42:24 | [diff] [blame] | 778 | and the index, again before using the <em>commit</em> command; |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 779 | </p> |
| 780 | </li> |
| 781 | <li> |
| 782 | <p> |
| Junio C Hamano | c0859f7 | 2016-10-17 22:22:57 | [diff] [blame] | 783 | by listing files as arguments to the <em>commit</em> command |
| 784 | (without --interactive or --patch switch), in which |
| Junio C Hamano | bd2b4bb | 2007-08-06 06:42:24 | [diff] [blame] | 785 | case the commit will ignore changes staged in the index, and instead |
| Junio C Hamano | 5081985 | 2008-11-19 02:07:56 | [diff] [blame] | 786 | record the current content of the listed files (which must already |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 787 | be known to Git); |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 788 | </p> |
| 789 | </li> |
| 790 | <li> |
| 791 | <p> |
| Junio C Hamano | bd2b4bb | 2007-08-06 06:42:24 | [diff] [blame] | 792 | by using the -a switch with the <em>commit</em> command to automatically |
| 793 | "add" changes from all known files (i.e. all files that are already |
| 794 | listed in the index) and to automatically "rm" files in the index |
| 795 | that have been removed from the working tree, and then perform the |
| 796 | actual commit; |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 797 | </p> |
| 798 | </li> |
| Junio C Hamano | c51fede | 2007-03-12 07:29:20 | [diff] [blame] | 799 | <li> |
| 800 | <p> |
| Junio C Hamano | 3d050d6 | 2011-05-17 06:43:34 | [diff] [blame] | 801 | by using the --interactive or --patch switches with the <em>commit</em> command |
| Junio C Hamano | c0859f7 | 2016-10-17 22:22:57 | [diff] [blame] | 802 | to decide one by one which files or hunks should be part of the commit |
| 803 | in addition to contents in the index, |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 804 | before finalizing the operation. See the “Interactive Mode” section of |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 805 | <a href="git-add.html">git-add(1)</a> to learn how to operate these modes. |
| Junio C Hamano | c51fede | 2007-03-12 07:29:20 | [diff] [blame] | 806 | </p> |
| 807 | </li> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 808 | </ol></div> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 809 | <div class="paragraph"><p>The <code>--dry-run</code> option can be used to obtain a |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 810 | summary of what is included by any of the above for the next |
| Junio C Hamano | 1bb3199 | 2009-08-29 04:24:08 | [diff] [blame] | 811 | commit by giving the same set of parameters (options and paths).</p></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 812 | <div class="paragraph"><p>If you make a commit and then find a mistake immediately after |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 813 | that, you can recover from it with <em>git reset</em>.</p></div> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 814 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 815 | </div> |
| 816 | <div class="sect1"> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 817 | <h2 id="_options">OPTIONS</h2> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 818 | <div class="sectionbody"> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 819 | <div class="dlist"><dl> |
| 820 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 821 | -a |
| 822 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 823 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 824 | --all |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 825 | </dt> |
| 826 | <dd> |
| 827 | <p> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 828 | Tell the command to automatically stage files that have |
| 829 | been modified and deleted, but new files you have not |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 830 | told Git about are not affected. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 831 | </p> |
| 832 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 833 | <dt class="hdlist1"> |
| Junio C Hamano | 3d050d6 | 2011-05-17 06:43:34 | [diff] [blame] | 834 | -p |
| 835 | </dt> |
| 836 | <dt class="hdlist1"> |
| 837 | --patch |
| 838 | </dt> |
| 839 | <dd> |
| 840 | <p> |
| 841 | Use the interactive patch selection interface to chose |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 842 | which changes to commit. See <a href="git-add.html">git-add(1)</a> for |
| Junio C Hamano | 3d050d6 | 2011-05-17 06:43:34 | [diff] [blame] | 843 | details. |
| 844 | </p> |
| 845 | </dd> |
| 846 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 847 | -C <commit> |
| 848 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 849 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 850 | --reuse-message=<commit> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 851 | </dt> |
| 852 | <dd> |
| 853 | <p> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 854 | Take an existing commit object, and reuse the log message |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 855 | and the authorship information (including the timestamp) |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 856 | when creating the commit. |
| 857 | </p> |
| 858 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 859 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 860 | -c <commit> |
| 861 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 862 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 863 | --reedit-message=<commit> |
| 864 | </dt> |
| 865 | <dd> |
| 866 | <p> |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 867 | Like <em>-C</em>, but with <code>-c</code> the editor is invoked, so that |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 868 | the user can further edit the commit message. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 869 | </p> |
| 870 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 871 | <dt class="hdlist1"> |
| Junio C Hamano | 2e6ded8 | 2010-12-05 06:20:48 | [diff] [blame] | 872 | --fixup=<commit> |
| 873 | </dt> |
| 874 | <dd> |
| 875 | <p> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 876 | Construct a commit message for use with <code>rebase --autosquash</code>. |
| Junio C Hamano | 2e6ded8 | 2010-12-05 06:20:48 | [diff] [blame] | 877 | The commit message will be the subject line from the specified |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 878 | commit with a prefix of "fixup! ". See <a href="git-rebase.html">git-rebase(1)</a> |
| Junio C Hamano | 2e6ded8 | 2010-12-05 06:20:48 | [diff] [blame] | 879 | for details. |
| 880 | </p> |
| 881 | </dd> |
| 882 | <dt class="hdlist1"> |
| 883 | --squash=<commit> |
| 884 | </dt> |
| 885 | <dd> |
| 886 | <p> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 887 | Construct a commit message for use with <code>rebase --autosquash</code>. |
| Junio C Hamano | 2e6ded8 | 2010-12-05 06:20:48 | [diff] [blame] | 888 | The commit message subject line is taken from the specified |
| 889 | commit with a prefix of "squash! ". Can be used with additional |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 890 | commit message options (<code>-m</code>/<code>-c</code>/<code>-C</code>/<code>-F</code>). See |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 891 | <a href="git-rebase.html">git-rebase(1)</a> for details. |
| Junio C Hamano | 2e6ded8 | 2010-12-05 06:20:48 | [diff] [blame] | 892 | </p> |
| 893 | </dd> |
| 894 | <dt class="hdlist1"> |
| Junio C Hamano | 2bd8a74 | 2009-12-01 21:16:59 | [diff] [blame] | 895 | --reset-author |
| 896 | </dt> |
| 897 | <dd> |
| 898 | <p> |
| Junio C Hamano | a8cc1d8 | 2011-03-10 01:18:12 | [diff] [blame] | 899 | When used with -C/-c/--amend options, or when committing after a |
| Junio C Hamano | 4c60d9a | 2017-05-04 14:36:22 | [diff] [blame] | 900 | conflicting cherry-pick, declare that the authorship of the |
| Junio C Hamano | 85f1fde | 2015-06-01 20:37:32 | [diff] [blame] | 901 | resulting commit now belongs to the committer. This also renews |
| Junio C Hamano | a8cc1d8 | 2011-03-10 01:18:12 | [diff] [blame] | 902 | the author timestamp. |
| Junio C Hamano | 2bd8a74 | 2009-12-01 21:16:59 | [diff] [blame] | 903 | </p> |
| 904 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 905 | <dt class="hdlist1"> |
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 906 | --short |
| 907 | </dt> |
| 908 | <dd> |
| 909 | <p> |
| 910 | When doing a dry-run, give the output in the short-format. See |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 911 | <a href="git-status.html">git-status(1)</a> for details. Implies <code>--dry-run</code>. |
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 912 | </p> |
| 913 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 914 | <dt class="hdlist1"> |
| Junio C Hamano | 9257a33 | 2012-06-25 20:01:02 | [diff] [blame] | 915 | --branch |
| 916 | </dt> |
| 917 | <dd> |
| 918 | <p> |
| 919 | Show the branch and tracking info even in short-format. |
| 920 | </p> |
| 921 | </dd> |
| 922 | <dt class="hdlist1"> |
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 923 | --porcelain |
| 924 | </dt> |
| 925 | <dd> |
| 926 | <p> |
| 927 | When doing a dry-run, give the output in a porcelain-ready |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 928 | format. See <a href="git-status.html">git-status(1)</a> for details. Implies |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 929 | <code>--dry-run</code>. |
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 930 | </p> |
| 931 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 932 | <dt class="hdlist1"> |
| Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 933 | --long |
| 934 | </dt> |
| 935 | <dd> |
| 936 | <p> |
| Junio C Hamano | 4c60d9a | 2017-05-04 14:36:22 | [diff] [blame] | 937 | When doing a dry-run, give the output in the long-format. |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 938 | Implies <code>--dry-run</code>. |
| Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 939 | </p> |
| 940 | </dd> |
| 941 | <dt class="hdlist1"> |
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 942 | -z |
| 943 | </dt> |
| Junio C Hamano | 9257a33 | 2012-06-25 20:01:02 | [diff] [blame] | 944 | <dt class="hdlist1"> |
| 945 | --null |
| 946 | </dt> |
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 947 | <dd> |
| 948 | <p> |
| Junio C Hamano | 0f6f3bf | 2017-03-13 07:01:53 | [diff] [blame] | 949 | When showing <code>short</code> or <code>porcelain</code> status output, print the |
| 950 | filename verbatim and terminate the entries with NUL, instead of LF. |
| 951 | If no format is given, implies the <code>--porcelain</code> output format. |
| 952 | Without the <code>-z</code> option, filenames with "unusual" characters are |
| 953 | quoted as explained for the configuration variable <code>core.quotePath</code> |
| 954 | (see <a href="git-config.html">git-config(1)</a>). |
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 955 | </p> |
| 956 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 957 | <dt class="hdlist1"> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 958 | -F <file> |
| 959 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 960 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 961 | --file=<file> |
| 962 | </dt> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 963 | <dd> |
| 964 | <p> |
| 965 | Take the commit message from the given file. Use <em>-</em> to |
| 966 | read the message from the standard input. |
| 967 | </p> |
| 968 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 969 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 970 | --author=<author> |
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 971 | </dt> |
| 972 | <dd> |
| 973 | <p> |
| Junio C Hamano | 13002fb | 2010-06-08 05:53:58 | [diff] [blame] | 974 | Override the commit author. Specify an explicit author using the |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 975 | standard <code>A U Thor <author@example.com></code> format. Otherwise <author> |
| Junio C Hamano | 13002fb | 2010-06-08 05:53:58 | [diff] [blame] | 976 | is assumed to be a pattern and is used to search for an existing |
| 977 | commit by that author (i.e. rev-list --all -i --author=<author>); |
| 978 | the commit author is then copied from the first such commit found. |
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 979 | </p> |
| 980 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 981 | <dt class="hdlist1"> |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 982 | --date=<date> |
| 983 | </dt> |
| 984 | <dd> |
| 985 | <p> |
| 986 | Override the author date used in the commit. |
| 987 | </p> |
| 988 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 989 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 990 | -m <msg> |
| 991 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 992 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 993 | --message=<msg> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 994 | </dt> |
| 995 | <dd> |
| 996 | <p> |
| 997 | Use the given <msg> as the commit message. |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 998 | If multiple <code>-m</code> options are given, their values are |
| Junio C Hamano | 09cfe6f | 2013-03-27 22:10:42 | [diff] [blame] | 999 | concatenated as separate paragraphs. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1000 | </p> |
| Junio C Hamano | 7b9cce9 | 2018-01-23 22:34:27 | [diff] [blame] | 1001 | <div class="paragraph"><p>The <code>-m</code> option is mutually exclusive with <code>-c</code>, <code>-C</code>, and <code>-F</code>.</p></div> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1002 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1003 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1004 | -t <file> |
| 1005 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1006 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1007 | --template=<file> |
| Junio C Hamano | a3770f9 | 2007-07-25 08:53:33 | [diff] [blame] | 1008 | </dt> |
| 1009 | <dd> |
| 1010 | <p> |
| Junio C Hamano | 51f87de | 2012-04-16 21:18:54 | [diff] [blame] | 1011 | When editing the commit message, start the editor with the |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1012 | contents in the given file. The <code>commit.template</code> configuration |
| Junio C Hamano | 51f87de | 2012-04-16 21:18:54 | [diff] [blame] | 1013 | variable is often used to give this option implicitly to the |
| 1014 | command. This mechanism can be used by projects that want to |
| 1015 | guide participants with some hints on what to write in the message |
| 1016 | in what order. If the user exits the editor without editing the |
| 1017 | message, the commit is aborted. This has no effect when a message |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1018 | is given by other means, e.g. with the <code>-m</code> or <code>-F</code> options. |
| Junio C Hamano | a3770f9 | 2007-07-25 08:53:33 | [diff] [blame] | 1019 | </p> |
| 1020 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1021 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1022 | -s |
| 1023 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1024 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1025 | --signoff |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1026 | </dt> |
| 1027 | <dd> |
| 1028 | <p> |
| Junio C Hamano | 610d176 | 2008-11-28 06:27:13 | [diff] [blame] | 1029 | Add Signed-off-by line by the committer at the end of the commit |
| Junio C Hamano | 4e6ba27 | 2016-01-20 23:23:19 | [diff] [blame] | 1030 | log message. The meaning of a signoff depends on the project, |
| 1031 | but it typically certifies that committer has |
| 1032 | the rights to submit this work under the same license and |
| 1033 | agrees to a Developer Certificate of Origin |
| 1034 | (see <a href="http://developercertificate.org/">http://developercertificate.org/</a> for more information). |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1035 | </p> |
| 1036 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1037 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1038 | -n |
| 1039 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1040 | <dt class="hdlist1"> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1041 | --no-verify |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1042 | </dt> |
| 1043 | <dd> |
| 1044 | <p> |
| Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 1045 | This option bypasses the pre-commit and commit-msg hooks. |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1046 | See also <a href="githooks.html">githooks(5)</a>. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1047 | </p> |
| 1048 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1049 | <dt class="hdlist1"> |
| Junio C Hamano | 0c99970 | 2007-12-03 09:57:55 | [diff] [blame] | 1050 | --allow-empty |
| 1051 | </dt> |
| 1052 | <dd> |
| 1053 | <p> |
| 1054 | Usually recording a commit that has the exact same tree as its |
| Junio C Hamano | 5825687 | 2007-12-04 08:31:13 | [diff] [blame] | 1055 | sole parent commit is a mistake, and the command prevents you |
| 1056 | from making such a commit. This option bypasses the safety, and |
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 1057 | is primarily for use by foreign SCM interface scripts. |
| Junio C Hamano | 0c99970 | 2007-12-03 09:57:55 | [diff] [blame] | 1058 | </p> |
| 1059 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1060 | <dt class="hdlist1"> |
| Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 1061 | --allow-empty-message |
| 1062 | </dt> |
| 1063 | <dd> |
| 1064 | <p> |
| 1065 | Like --allow-empty this command is primarily for use by foreign |
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 1066 | SCM interface scripts. It allows you to create a commit with an |
| Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 1067 | empty commit message without using plumbing commands like |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1068 | <a href="git-commit-tree.html">git-commit-tree(1)</a>. |
| Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 1069 | </p> |
| 1070 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1071 | <dt class="hdlist1"> |
| Junio C Hamano | 554da79 | 2007-12-27 03:29:58 | [diff] [blame] | 1072 | --cleanup=<mode> |
| 1073 | </dt> |
| 1074 | <dd> |
| 1075 | <p> |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1076 | This option determines how the supplied commit message should be |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1077 | cleaned up before committing. The <em><mode></em> can be <code>strip</code>, |
| 1078 | <code>whitespace</code>, <code>verbatim</code>, <code>scissors</code> or <code>default</code>. |
| Junio C Hamano | 554da79 | 2007-12-27 03:29:58 | [diff] [blame] | 1079 | </p> |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1080 | <div class="openblock"> |
| 1081 | <div class="content"> |
| 1082 | <div class="dlist"><dl> |
| 1083 | <dt class="hdlist1"> |
| 1084 | strip |
| 1085 | </dt> |
| 1086 | <dd> |
| 1087 | <p> |
| Junio C Hamano | e1b2859 | 2015-05-19 21:26:17 | [diff] [blame] | 1088 | Strip leading and trailing empty lines, trailing whitespace, |
| 1089 | commentary and collapse consecutive empty lines. |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1090 | </p> |
| 1091 | </dd> |
| 1092 | <dt class="hdlist1"> |
| 1093 | whitespace |
| 1094 | </dt> |
| 1095 | <dd> |
| 1096 | <p> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1097 | Same as <code>strip</code> except #commentary is not removed. |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1098 | </p> |
| 1099 | </dd> |
| 1100 | <dt class="hdlist1"> |
| 1101 | verbatim |
| 1102 | </dt> |
| 1103 | <dd> |
| 1104 | <p> |
| 1105 | Do not change the message at all. |
| 1106 | </p> |
| 1107 | </dd> |
| 1108 | <dt class="hdlist1"> |
| Junio C Hamano | 3214e5f | 2014-03-25 19:54:38 | [diff] [blame] | 1109 | scissors |
| 1110 | </dt> |
| 1111 | <dd> |
| 1112 | <p> |
| Junio C Hamano | bb34c10 | 2017-07-21 22:42:28 | [diff] [blame] | 1113 | Same as <code>whitespace</code> except that everything from (and including) |
| 1114 | the line found below is truncated, if the message is to be edited. |
| 1115 | "<code>#</code>" can be customized with core.commentChar. |
| Junio C Hamano | 3214e5f | 2014-03-25 19:54:38 | [diff] [blame] | 1116 | </p> |
| Junio C Hamano | bb34c10 | 2017-07-21 22:42:28 | [diff] [blame] | 1117 | <div class="literalblock"> |
| 1118 | <div class="content"> |
| 1119 | <pre><code># ------------------------ >8 ------------------------</code></pre> |
| 1120 | </div></div> |
| Junio C Hamano | 3214e5f | 2014-03-25 19:54:38 | [diff] [blame] | 1121 | </dd> |
| 1122 | <dt class="hdlist1"> |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1123 | default |
| 1124 | </dt> |
| 1125 | <dd> |
| 1126 | <p> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1127 | Same as <code>strip</code> if the message is to be edited. |
| 1128 | Otherwise <code>whitespace</code>. |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1129 | </p> |
| 1130 | </dd> |
| 1131 | </dl></div> |
| 1132 | </div></div> |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1133 | <div class="paragraph"><p>The default can be changed by the <code>commit.cleanup</code> configuration |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1134 | variable (see <a href="git-config.html">git-config(1)</a>).</p></div> |
| Junio C Hamano | 554da79 | 2007-12-27 03:29:58 | [diff] [blame] | 1135 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1136 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1137 | -e |
| 1138 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1139 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1140 | --edit |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1141 | </dt> |
| 1142 | <dd> |
| 1143 | <p> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1144 | The message taken from file with <code>-F</code>, command line with |
| 1145 | <code>-m</code>, and from commit object with <code>-C</code> are usually used as |
| Junio C Hamano | c097e56 | 2013-05-03 23:06:12 | [diff] [blame] | 1146 | the commit log message unmodified. This option lets you |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1147 | further edit the message taken from these sources. |
| 1148 | </p> |
| 1149 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1150 | <dt class="hdlist1"> |
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1151 | --no-edit |
| 1152 | </dt> |
| 1153 | <dd> |
| 1154 | <p> |
| 1155 | Use the selected commit message without launching an editor. |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1156 | For example, <code>git commit --amend --no-edit</code> amends a commit |
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1157 | without changing its commit message. |
| 1158 | </p> |
| 1159 | </dd> |
| 1160 | <dt class="hdlist1"> |
| Junio C Hamano | bfe9e75 | 2006-04-05 21:43:28 | [diff] [blame] | 1161 | --amend |
| 1162 | </dt> |
| 1163 | <dd> |
| 1164 | <p> |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 1165 | Replace the tip of the current branch by creating a new |
| 1166 | commit. The recorded tree is prepared as usual (including |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1167 | the effect of the <code>-i</code> and <code>-o</code> options and explicit |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 1168 | pathspec), and the message from the original commit is used |
| 1169 | as the starting point, instead of an empty message, when no |
| 1170 | other message is specified from the command line via options |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1171 | such as <code>-m</code>, <code>-F</code>, <code>-c</code>, etc. The new commit has the same |
| 1172 | parents and author as the current one (the <code>--reset-author</code> |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 1173 | option can countermand this). |
| Junio C Hamano | bfe9e75 | 2006-04-05 21:43:28 | [diff] [blame] | 1174 | </p> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1175 | <div class="openblock"> |
| 1176 | <div class="content"> |
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1177 | <div class="paragraph"><p>It is a rough equivalent for:</p></div> |
| 1178 | <div class="listingblock"> |
| 1179 | <div class="content"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1180 | <pre><code> $ git reset --soft HEAD^ |
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1181 | $ ... do something else to come up with the right tree ... |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1182 | $ git commit -c ORIG_HEAD</code></pre> |
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1183 | </div></div> |
| 1184 | <div class="paragraph"><p>but can be used to amend a merge commit.</p></div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1185 | </div></div> |
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1186 | <div class="paragraph"><p>You should understand the implications of rewriting history if you |
| 1187 | amend a commit that has already been published. (See the "RECOVERING |
| 1188 | FROM UPSTREAM REBASE" section in <a href="git-rebase.html">git-rebase(1)</a>.)</p></div> |
| Junio C Hamano | 9257a33 | 2012-06-25 20:01:02 | [diff] [blame] | 1189 | </dd> |
| 1190 | <dt class="hdlist1"> |
| 1191 | --no-post-rewrite |
| 1192 | </dt> |
| 1193 | <dd> |
| 1194 | <p> |
| 1195 | Bypass the post-rewrite hook. |
| 1196 | </p> |
| 1197 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1198 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1199 | -i |
| 1200 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1201 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1202 | --include |
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 1203 | </dt> |
| 1204 | <dd> |
| 1205 | <p> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1206 | Before making a commit out of staged contents so far, |
| 1207 | stage the contents of paths given on the command line |
| 1208 | as well. This is usually not what you want unless you |
| 1209 | are concluding a conflicted merge. |
| Junio C Hamano | 6697ac5 | 2006-02-14 08:00:23 | [diff] [blame] | 1210 | </p> |
| 1211 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1212 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1213 | -o |
| 1214 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1215 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1216 | --only |
| Junio C Hamano | e79159d | 2008-04-12 08:23:17 | [diff] [blame] | 1217 | </dt> |
| 1218 | <dd> |
| 1219 | <p> |
| Junio C Hamano | 19a0f4e | 2014-11-18 21:46:36 | [diff] [blame] | 1220 | Make a commit by taking the updated working tree contents |
| 1221 | of the paths specified on the |
| Junio C Hamano | e79159d | 2008-04-12 08:23:17 | [diff] [blame] | 1222 | command line, disregarding any contents that have been |
| Junio C Hamano | 19a0f4e | 2014-11-18 21:46:36 | [diff] [blame] | 1223 | staged for other paths. This is the default mode of operation of |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1224 | <em>git commit</em> if any paths are given on the command line, |
| Junio C Hamano | e79159d | 2008-04-12 08:23:17 | [diff] [blame] | 1225 | in which case this option can be omitted. |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 1226 | If this option is specified together with <code>--amend</code>, then |
| Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 1227 | no paths need to be specified, which can be used to amend |
| Junio C Hamano | e79159d | 2008-04-12 08:23:17 | [diff] [blame] | 1228 | the last commit without committing changes that have |
| Junio C Hamano | 52b1cfb | 2016-12-20 00:18:36 | [diff] [blame] | 1229 | already been staged. If used together with <code>--allow-empty</code> |
| 1230 | paths are also not required, and an empty commit will be created. |
| Junio C Hamano | e79159d | 2008-04-12 08:23:17 | [diff] [blame] | 1231 | </p> |
| 1232 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1233 | <dt class="hdlist1"> |
| Junio C Hamano | 4224f99 | 2008-06-23 07:14:08 | [diff] [blame] | 1234 | -u[<mode>] |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1235 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1236 | <dt class="hdlist1"> |
| Junio C Hamano | 4224f99 | 2008-06-23 07:14:08 | [diff] [blame] | 1237 | --untracked-files[=<mode>] |
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1238 | </dt> |
| 1239 | <dd> |
| 1240 | <p> |
| Junio C Hamano | 36a4dbc | 2011-02-22 07:51:32 | [diff] [blame] | 1241 | Show untracked files. |
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1242 | </p> |
| Junio C Hamano | 36a4dbc | 2011-02-22 07:51:32 | [diff] [blame] | 1243 | <div class="paragraph"><p>The mode parameter is optional (defaults to <em>all</em>), and is used to |
| 1244 | specify the handling of untracked files; when -u is not used, the |
| 1245 | default is <em>normal</em>, i.e. show untracked files and directories.</p></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1246 | <div class="paragraph"><p>The possible options are:</p></div> |
| 1247 | <div class="ulist"><ul> |
| Junio C Hamano | 4224f99 | 2008-06-23 07:14:08 | [diff] [blame] | 1248 | <li> |
| 1249 | <p> |
| 1250 | <em>no</em> - Show no untracked files |
| 1251 | </p> |
| 1252 | </li> |
| 1253 | <li> |
| 1254 | <p> |
| 1255 | <em>normal</em> - Shows untracked files and directories |
| 1256 | </p> |
| 1257 | </li> |
| 1258 | <li> |
| 1259 | <p> |
| 1260 | <em>all</em> - Also shows individual files in untracked directories. |
| 1261 | </p> |
| Junio C Hamano | 36a4dbc | 2011-02-22 07:51:32 | [diff] [blame] | 1262 | <div class="paragraph"><p>The default can be changed using the status.showUntrackedFiles |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1263 | configuration variable documented in <a href="git-config.html">git-config(1)</a>.</p></div> |
| Junio C Hamano | e1cca18 | 2010-02-20 20:01:23 | [diff] [blame] | 1264 | </li> |
| 1265 | </ul></div> |
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1266 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1267 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1268 | -v |
| 1269 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1270 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1271 | --verbose |
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1272 | </dt> |
| 1273 | <dd> |
| 1274 | <p> |
| 1275 | Show unified diff between the HEAD commit and what |
| 1276 | would be committed at the bottom of the commit message |
| Junio C Hamano | e1b2859 | 2015-05-19 21:26:17 | [diff] [blame] | 1277 | template to help the user describe the commit by reminding |
| 1278 | what changes the commit has. |
| 1279 | Note that this diff output doesn’t have its |
| 1280 | lines prefixed with <em>#</em>. This diff will not be a part |
| Junio C Hamano | f2a3a75 | 2016-05-23 22:54:39 | [diff] [blame] | 1281 | of the commit message. See the <code>commit.verbose</code> configuration |
| 1282 | variable in <a href="git-config.html">git-config(1)</a>. |
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1283 | </p> |
| Junio C Hamano | 5992a25 | 2015-03-17 23:39:30 | [diff] [blame] | 1284 | <div class="paragraph"><p>If specified twice, show in addition the unified diff between |
| 1285 | what would be committed and the worktree files, i.e. the unstaged |
| 1286 | changes to tracked files.</p></div> |
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1287 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1288 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1289 | -q |
| 1290 | </dt> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1291 | <dt class="hdlist1"> |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1292 | --quiet |
| Junio C Hamano | 7d23f5e | 2006-12-16 07:44:04 | [diff] [blame] | 1293 | </dt> |
| 1294 | <dd> |
| 1295 | <p> |
| Junio C Hamano | f9771f6 | 2007-01-17 17:42:30 | [diff] [blame] | 1296 | Suppress commit summary message. |
| Junio C Hamano | 7d23f5e | 2006-12-16 07:44:04 | [diff] [blame] | 1297 | </p> |
| 1298 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1299 | <dt class="hdlist1"> |
| Junio C Hamano | 1bb3199 | 2009-08-29 04:24:08 | [diff] [blame] | 1300 | --dry-run |
| 1301 | </dt> |
| 1302 | <dd> |
| 1303 | <p> |
| 1304 | Do not create a commit, but show a list of paths that are |
| 1305 | to be committed, paths with local changes that will be left |
| 1306 | uncommitted and paths that are untracked. |
| 1307 | </p> |
| 1308 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1309 | <dt class="hdlist1"> |
| Junio C Hamano | 6ce6b6c | 2010-01-18 01:25:50 | [diff] [blame] | 1310 | --status |
| 1311 | </dt> |
| 1312 | <dd> |
| 1313 | <p> |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1314 | Include the output of <a href="git-status.html">git-status(1)</a> in the commit |
| Junio C Hamano | 6ce6b6c | 2010-01-18 01:25:50 | [diff] [blame] | 1315 | message template when using an editor to prepare the commit |
| 1316 | message. Defaults to on, but can be used to override |
| 1317 | configuration variable commit.status. |
| 1318 | </p> |
| 1319 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1320 | <dt class="hdlist1"> |
| Junio C Hamano | 6ce6b6c | 2010-01-18 01:25:50 | [diff] [blame] | 1321 | --no-status |
| 1322 | </dt> |
| 1323 | <dd> |
| 1324 | <p> |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1325 | Do not include the output of <a href="git-status.html">git-status(1)</a> in the |
| Junio C Hamano | 6ce6b6c | 2010-01-18 01:25:50 | [diff] [blame] | 1326 | commit message template when using an editor to prepare the |
| 1327 | default commit message. |
| 1328 | </p> |
| 1329 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1330 | <dt class="hdlist1"> |
| Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 1331 | -S[<keyid>] |
| 1332 | </dt> |
| 1333 | <dt class="hdlist1"> |
| 1334 | --gpg-sign[=<keyid>] |
| 1335 | </dt> |
| 1336 | <dd> |
| 1337 | <p> |
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 1338 | GPG-sign commits. The <code>keyid</code> argument is optional and |
| 1339 | defaults to the committer identity; if specified, it must be |
| 1340 | stuck to the option without a space. |
| Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 1341 | </p> |
| 1342 | </dd> |
| 1343 | <dt class="hdlist1"> |
| Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 1344 | --no-gpg-sign |
| 1345 | </dt> |
| 1346 | <dd> |
| 1347 | <p> |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1348 | Countermand <code>commit.gpgSign</code> configuration variable that is |
| Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 1349 | set to force each and every commit to be signed. |
| 1350 | </p> |
| 1351 | </dd> |
| 1352 | <dt class="hdlist1"> |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame] | 1353 | -- |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1354 | </dt> |
| 1355 | <dd> |
| 1356 | <p> |
| 1357 | Do not interpret any more arguments as options. |
| 1358 | </p> |
| 1359 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1360 | <dt class="hdlist1"> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1361 | <file>… |
| 1362 | </dt> |
| 1363 | <dd> |
| 1364 | <p> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1365 | When files are given on the command line, the command |
| 1366 | commits the contents of the named files, without |
| 1367 | recording the changes already staged. The contents of |
| 1368 | these files are also staged for the next commit on top |
| 1369 | of what have been staged before. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1370 | </p> |
| 1371 | </dd> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1372 | </dl></div> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1373 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1374 | </div> |
| 1375 | <div class="sect1"> |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1376 | <h2 id="_date_formats">DATE FORMATS</h2> |
| 1377 | <div class="sectionbody"> |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1378 | <div class="paragraph"><p>The <code>GIT_AUTHOR_DATE</code>, <code>GIT_COMMITTER_DATE</code> environment variables |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1379 | and the <code>--date</code> option |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1380 | support the following date formats:</p></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1381 | <div class="dlist"><dl> |
| 1382 | <dt class="hdlist1"> |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1383 | Git internal format |
| 1384 | </dt> |
| 1385 | <dd> |
| 1386 | <p> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1387 | It is <code><unix timestamp> <time zone offset></code>, where <code><unix |
| 1388 | timestamp></code> is the number of seconds since the UNIX epoch. |
| 1389 | <code><time zone offset></code> is a positive or negative offset from UTC. |
| Junio C Hamano | 52b1cfb | 2016-12-20 00:18:36 | [diff] [blame] | 1390 | For example CET (which is 1 hour ahead of UTC) is <code>+0100</code>. |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1391 | </p> |
| 1392 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1393 | <dt class="hdlist1"> |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1394 | RFC 2822 |
| 1395 | </dt> |
| 1396 | <dd> |
| 1397 | <p> |
| 1398 | The standard email format as described by RFC 2822, for example |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1399 | <code>Thu, 07 Apr 2005 22:13:13 +0200</code>. |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1400 | </p> |
| 1401 | </dd> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1402 | <dt class="hdlist1"> |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1403 | ISO 8601 |
| 1404 | </dt> |
| 1405 | <dd> |
| 1406 | <p> |
| 1407 | Time and date specified by the ISO 8601 standard, for example |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1408 | <code>2005-04-07T22:13:13</code>. The parser accepts a space instead of the |
| 1409 | <code>T</code> character as well. |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1410 | </p> |
| 1411 | <div class="admonitionblock"> |
| 1412 | <table><tr> |
| 1413 | <td class="icon"> |
| 1414 | <div class="title">Note</div> |
| 1415 | </td> |
| 1416 | <td class="content">In addition, the date part is accepted in the following formats: |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1417 | <code>YYYY.MM.DD</code>, <code>MM/DD/YYYY</code> and <code>DD.MM.YYYY</code>.</td> |
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1418 | </tr></table> |
| 1419 | </div> |
| 1420 | </dd> |
| 1421 | </dl></div> |
| 1422 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1423 | </div> |
| 1424 | <div class="sect1"> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1425 | <h2 id="_examples">EXAMPLES</h2> |
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 1426 | <div class="sectionbody"> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1427 | <div class="paragraph"><p>When recording your own work, the contents of modified files in |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1428 | your working tree are temporarily stored to a staging area |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1429 | called the "index" with <em>git add</em>. A file can be |
| Junio C Hamano | 361c133 | 2007-11-14 12:17:22 | [diff] [blame] | 1430 | reverted back, only in the index but not in the working tree, |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1431 | to that of the last commit with <code>git reset HEAD -- <file></code>, |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1432 | which effectively reverts <em>git add</em> and prevents the changes to |
| Junio C Hamano | 361c133 | 2007-11-14 12:17:22 | [diff] [blame] | 1433 | this file from participating in the next commit. After building |
| 1434 | the state to be committed incrementally with these commands, |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1435 | <code>git commit</code> (without any pathname parameter) is used to record what |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1436 | has been staged so far. This is the most basic form of the |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1437 | command. An example:</p></div> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1438 | <div class="listingblock"> |
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 1439 | <div class="content"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1440 | <pre><code>$ edit hello.c |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1441 | $ git rm goodbye.c |
| 1442 | $ git add hello.c |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1443 | $ git commit</code></pre> |
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 1444 | </div></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1445 | <div class="paragraph"><p>Instead of staging files after each individual change, you can |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1446 | tell <code>git commit</code> to notice the changes to the files whose |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1447 | contents are tracked in |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1448 | your working tree and do corresponding <code>git add</code> and <code>git rm</code> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1449 | for you. That is, this example does the same as the earlier |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1450 | example if there is no other change in your working tree:</p></div> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1451 | <div class="listingblock"> |
| 1452 | <div class="content"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1453 | <pre><code>$ edit hello.c |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1454 | $ rm goodbye.c |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1455 | $ git commit -a</code></pre> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1456 | </div></div> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1457 | <div class="paragraph"><p>The command <code>git commit -a</code> first looks at your working tree, |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1458 | notices that you have modified hello.c and removed goodbye.c, |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1459 | and performs necessary <code>git add</code> and <code>git rm</code> for you.</p></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1460 | <div class="paragraph"><p>After staging changes to many files, you can alter the order the |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1461 | changes are recorded in, by giving pathnames to <code>git commit</code>. |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1462 | When pathnames are given, the command makes a commit that |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1463 | only records the changes made to the named paths:</p></div> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1464 | <div class="listingblock"> |
| 1465 | <div class="content"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1466 | <pre><code>$ edit hello.c hello.h |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1467 | $ git add hello.c hello.h |
| 1468 | $ edit Makefile |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1469 | $ git commit Makefile</code></pre> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1470 | </div></div> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1471 | <div class="paragraph"><p>This makes a commit that records the modification to <code>Makefile</code>. |
| 1472 | The changes staged for <code>hello.c</code> and <code>hello.h</code> are not included |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1473 | in the resulting commit. However, their changes are not lost — they are still staged and merely held back. After the above |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1474 | sequence, if you do:</p></div> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1475 | <div class="listingblock"> |
| 1476 | <div class="content"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1477 | <pre><code>$ git commit</code></pre> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1478 | </div></div> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1479 | <div class="paragraph"><p>this second commit would record the changes to <code>hello.c</code> and |
| 1480 | <code>hello.h</code> as expected.</p></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1481 | <div class="paragraph"><p>After a merge (initiated by <em>git merge</em> or <em>git pull</em>) stops |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 1482 | because of conflicts, cleanly merged |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1483 | paths are already staged to be committed for you, and paths that |
| 1484 | conflicted are left in unmerged state. You would have to first |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1485 | check which paths are conflicting with <em>git status</em> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1486 | and after fixing them manually in your working tree, you would |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1487 | stage the result as usual with <em>git add</em>:</p></div> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1488 | <div class="listingblock"> |
| 1489 | <div class="content"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1490 | <pre><code>$ git status | grep unmerged |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1491 | unmerged: hello.c |
| 1492 | $ edit hello.c |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1493 | $ git add hello.c</code></pre> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1494 | </div></div> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1495 | <div class="paragraph"><p>After resolving conflicts and staging the result, <code>git ls-files -u</code> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1496 | would stop mentioning the conflicted path. When you are done, |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1497 | run <code>git commit</code> to finally record the merge:</p></div> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1498 | <div class="listingblock"> |
| 1499 | <div class="content"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1500 | <pre><code>$ git commit</code></pre> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1501 | </div></div> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1502 | <div class="paragraph"><p>As with the case to record your own changes, you can use <code>-a</code> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1503 | option to save typing. One difference is that during a merge |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1504 | resolution, you cannot use <code>git commit</code> with pathnames to |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1505 | alter the order the changes are committed, because the merge |
| 1506 | should be recorded as a single commit. In fact, the command |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1507 | refuses to run when given pathnames (but see <code>-i</code> option).</p></div> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1508 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1509 | </div> |
| 1510 | <div class="sect1"> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1511 | <h2 id="_discussion">DISCUSSION</h2> |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1512 | <div class="sectionbody"> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1513 | <div class="paragraph"><p>Though not required, it’s a good idea to begin the commit message |
| Junio C Hamano | 8f76dc6 | 2007-01-17 07:24:25 | [diff] [blame] | 1514 | with a single short (less than 50 character) line summarizing the |
| 1515 | change, followed by a blank line and then a more thorough description. |
| Junio C Hamano | 281fd39 | 2012-09-17 23:57:41 | [diff] [blame] | 1516 | The text up to the first blank line in a commit message is treated |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1517 | as the commit title, and that title is used throughout Git. |
| Junio C Hamano | 281fd39 | 2012-09-17 23:57:41 | [diff] [blame] | 1518 | For example, <a href="git-format-patch.html">git-format-patch(1)</a> turns a commit into email, and it uses |
| 1519 | the title on the Subject line and the rest of the commit in the body.</p></div> |
| Junio C Hamano | d7ed404 | 2015-08-03 19:43:00 | [diff] [blame] | 1520 | <div class="paragraph"><p>Git is to some extent character encoding agnostic.</p></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1521 | <div class="ulist"><ul> |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1522 | <li> |
| 1523 | <p> |
| Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 1524 | The contents of the blob objects are uninterpreted sequences |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1525 | of bytes. There is no encoding translation at the core |
| 1526 | level. |
| 1527 | </p> |
| 1528 | </li> |
| 1529 | <li> |
| 1530 | <p> |
| Junio C Hamano | d7ed404 | 2015-08-03 19:43:00 | [diff] [blame] | 1531 | Path names are encoded in UTF-8 normalization form C. This |
| 1532 | applies to tree objects, the index file, ref names, as well as |
| 1533 | path names in command line arguments, environment variables |
| 1534 | and config files (<code>.git/config</code> (see <a href="git-config.html">git-config(1)</a>), |
| 1535 | <a href="gitignore.html">gitignore(5)</a>, <a href="gitattributes.html">gitattributes(5)</a> and |
| 1536 | <a href="gitmodules.html">gitmodules(5)</a>). |
| 1537 | </p> |
| 1538 | <div class="paragraph"><p>Note that Git at the core level treats path names simply as |
| 1539 | sequences of non-NUL bytes, there are no path name encoding |
| 1540 | conversions (except on Mac and Windows). Therefore, using |
| 1541 | non-ASCII path names will mostly work even on platforms and file |
| 1542 | systems that use legacy extended ASCII encodings. However, |
| 1543 | repositories created on such systems will not work properly on |
| 1544 | UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. |
| 1545 | Additionally, many Git-based tools simply assume path names to |
| 1546 | be UTF-8 and will fail to display other encodings correctly.</p></div> |
| 1547 | </li> |
| 1548 | <li> |
| 1549 | <p> |
| 1550 | Commit log messages are typically encoded in UTF-8, but other |
| 1551 | extended ASCII encodings are also supported. This includes |
| 1552 | ISO-8859-x, CP125x and many others, but <em>not</em> UTF-16/32, |
| 1553 | EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5, |
| 1554 | EUC-x, CP9xx etc.). |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1555 | </p> |
| 1556 | </li> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1557 | </ul></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1558 | <div class="paragraph"><p>Although we encourage that the commit log messages are encoded |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1559 | in UTF-8, both the core and Git Porcelain are designed not to |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1560 | force UTF-8 on projects. If all participants of a particular |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1561 | project find it more convenient to use legacy encodings, Git |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1562 | does not forbid it. However, there are a few things to keep in |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1563 | mind.</p></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1564 | <div class="olist arabic"><ol class="arabic"> |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1565 | <li> |
| 1566 | <p> |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1567 | <em>git commit</em> and <em>git commit-tree</em> issues |
| Junio C Hamano | 14b7648 | 2008-01-05 10:32:26 | [diff] [blame] | 1568 | a warning if the commit log message given to it does not look |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1569 | like a valid UTF-8 string, unless you explicitly say your |
| 1570 | project uses a legacy encoding. The way to say this is to |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1571 | have i18n.commitencoding in <code>.git/config</code> file, like this: |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1572 | </p> |
| 1573 | <div class="listingblock"> |
| 1574 | <div class="content"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1575 | <pre><code>[i18n] |
| Junio C Hamano | bb34c10 | 2017-07-21 22:42:28 | [diff] [blame] | 1576 | commitEncoding = ISO-8859-1</code></pre> |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1577 | </div></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1578 | <div class="paragraph"><p>Commit objects created with the above setting record the value |
| Junio C Hamano | bb34c10 | 2017-07-21 22:42:28 | [diff] [blame] | 1579 | of <code>i18n.commitEncoding</code> in its <code>encoding</code> header. This is to |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1580 | help other people who look at them later. Lack of this header |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1581 | implies that the commit log message is encoded in UTF-8.</p></div> |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1582 | </li> |
| 1583 | <li> |
| 1584 | <p> |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1585 | <em>git log</em>, <em>git show</em>, <em>git blame</em> and friends look at the |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1586 | <code>encoding</code> header of a commit object, and try to re-code the |
| Junio C Hamano | aa17c7c | 2008-11-03 04:36:58 | [diff] [blame] | 1587 | log message into UTF-8 unless otherwise specified. You can |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1588 | specify the desired output encoding with |
| Junio C Hamano | bb34c10 | 2017-07-21 22:42:28 | [diff] [blame] | 1589 | <code>i18n.logOutputEncoding</code> in <code>.git/config</code> file, like this: |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1590 | </p> |
| 1591 | <div class="listingblock"> |
| 1592 | <div class="content"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1593 | <pre><code>[i18n] |
| Junio C Hamano | bb34c10 | 2017-07-21 22:42:28 | [diff] [blame] | 1594 | logOutputEncoding = ISO-8859-1</code></pre> |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1595 | </div></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1596 | <div class="paragraph"><p>If you do not have this configuration variable, the value of |
| Junio C Hamano | bb34c10 | 2017-07-21 22:42:28 | [diff] [blame] | 1597 | <code>i18n.commitEncoding</code> is used instead.</p></div> |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1598 | </li> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1599 | </ol></div> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1600 | <div class="paragraph"><p>Note that we deliberately chose not to re-code the commit log |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1601 | message when a commit is made to force UTF-8 at the commit |
| 1602 | object level, because re-coding to UTF-8 is not necessarily a |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1603 | reversible operation.</p></div> |
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1604 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1605 | </div> |
| 1606 | <div class="sect1"> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1607 | <h2 id="_environment_and_configuration_variables">ENVIRONMENT AND CONFIGURATION VARIABLES</h2> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1608 | <div class="sectionbody"> |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1609 | <div class="paragraph"><p>The editor used to edit the commit log message will be chosen from the |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1610 | <code>GIT_EDITOR</code> environment variable, the core.editor configuration variable, the |
| 1611 | <code>VISUAL</code> environment variable, or the <code>EDITOR</code> environment variable (in that |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1612 | order). See <a href="git-var.html">git-var(1)</a> for details.</p></div> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1613 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1614 | </div> |
| 1615 | <div class="sect1"> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1616 | <h2 id="_hooks">HOOKS</h2> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1617 | <div class="sectionbody"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1618 | <div class="paragraph"><p>This command can run <code>commit-msg</code>, <code>prepare-commit-msg</code>, <code>pre-commit</code>, |
| Junio C Hamano | cb06ef9 | 2017-03-21 22:40:14 | [diff] [blame] | 1619 | <code>post-commit</code> and <code>post-rewrite</code> hooks. See <a href="githooks.html">githooks(5)</a> for more |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1620 | information.</p></div> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1621 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1622 | </div> |
| 1623 | <div class="sect1"> |
| Junio C Hamano | 28a85be | 2012-07-24 22:05:15 | [diff] [blame] | 1624 | <h2 id="_files">FILES</h2> |
| 1625 | <div class="sectionbody"> |
| 1626 | <div class="dlist"><dl> |
| 1627 | <dt class="hdlist1"> |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1628 | <code>$GIT_DIR/COMMIT_EDITMSG</code> |
| Junio C Hamano | 28a85be | 2012-07-24 22:05:15 | [diff] [blame] | 1629 | </dt> |
| 1630 | <dd> |
| 1631 | <p> |
| 1632 | This file contains the commit message of a commit in progress. |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1633 | If <code>git commit</code> exits due to an error before creating a commit, |
| Junio C Hamano | 28a85be | 2012-07-24 22:05:15 | [diff] [blame] | 1634 | any commit message that has been provided by the user (e.g., in |
| 1635 | an editor session) will be available in this file, but will be |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1636 | overwritten by the next invocation of <code>git commit</code>. |
| Junio C Hamano | 28a85be | 2012-07-24 22:05:15 | [diff] [blame] | 1637 | </p> |
| 1638 | </dd> |
| 1639 | </dl></div> |
| 1640 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1641 | </div> |
| 1642 | <div class="sect1"> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1643 | <h2 id="_see_also">SEE ALSO</h2> |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1644 | <div class="sectionbody"> |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1645 | <div class="paragraph"><p><a href="git-add.html">git-add(1)</a>, |
| 1646 | <a href="git-rm.html">git-rm(1)</a>, |
| 1647 | <a href="git-mv.html">git-mv(1)</a>, |
| 1648 | <a href="git-merge.html">git-merge(1)</a>, |
| 1649 | <a href="git-commit-tree.html">git-commit-tree(1)</a></p></div> |
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 1650 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1651 | </div> |
| 1652 | <div class="sect1"> |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1653 | <h2 id="_git">GIT</h2> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1654 | <div class="sectionbody"> |
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1655 | <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] | 1656 | </div> |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 1657 | </div> |
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1658 | </div> |
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 1659 | <div id="footnotes"><hr /></div> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1660 | <div id="footer"> |
| 1661 | <div id="footer-text"> |
| Junio C Hamano | 2ef0ba3 | 2018-01-26 23:13:53 | [diff] [blame] | 1662 | Last updated |
| 1663 | 2018-01-26 15:11:04 PST |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1664 | </div> |
| 1665 | </div> |
| 1666 | </body> |
| 1667 | </html> |