| 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 | bd2b4bb | 2007-08-06 06:42:24 | [diff] [blame] | 783 | by listing files as arguments to the <em>commit</em> command, in which | 
|  | 784 | case the commit will ignore changes staged in the index, and instead | 
| Junio C Hamano | 5081985 | 2008-11-19 02:07:56 | [diff] [blame] | 785 | record the current content of the listed files (which must already | 
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 786 | be known to Git); | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 787 | </p> | 
|  | 788 | </li> | 
|  | 789 | <li> | 
|  | 790 | <p> | 
| Junio C Hamano | bd2b4bb | 2007-08-06 06:42:24 | [diff] [blame] | 791 | by using the -a switch with the <em>commit</em> command to automatically | 
|  | 792 | "add" changes from all known files (i.e. all files that are already | 
|  | 793 | listed in the index) and to automatically "rm" files in the index | 
|  | 794 | that have been removed from the working tree, and then perform the | 
|  | 795 | actual commit; | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 796 | </p> | 
|  | 797 | </li> | 
| Junio C Hamano | c51fede | 2007-03-12 07:29:20 | [diff] [blame] | 798 | <li> | 
|  | 799 | <p> | 
| Junio C Hamano | 3d050d6 | 2011-05-17 06:43:34 | [diff] [blame] | 800 | by using the --interactive or --patch switches with the <em>commit</em> command | 
|  | 801 | to decide one by one which files or hunks should be part of the commit, | 
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 802 | before finalizing the operation. See the “Interactive Mode” section of | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 803 | <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] | 804 | </p> | 
|  | 805 | </li> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 806 | </ol></div> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 807 | <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] | 808 | 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] | 809 | 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] | 810 | <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] | 811 | 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] | 812 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 813 | </div> | 
|  | 814 | <div class="sect1"> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 815 | <h2 id="_options">OPTIONS</h2> | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 816 | <div class="sectionbody"> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 817 | <div class="dlist"><dl> | 
|  | 818 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 819 | -a | 
|  | 820 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 821 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 822 | --all | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 823 | </dt> | 
|  | 824 | <dd> | 
|  | 825 | <p> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 826 | Tell the command to automatically stage files that have | 
|  | 827 | been modified and deleted, but new files you have not | 
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 828 | told Git about are not affected. | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 829 | </p> | 
|  | 830 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 831 | <dt class="hdlist1"> | 
| Junio C Hamano | 3d050d6 | 2011-05-17 06:43:34 | [diff] [blame] | 832 | -p | 
|  | 833 | </dt> | 
|  | 834 | <dt class="hdlist1"> | 
|  | 835 | --patch | 
|  | 836 | </dt> | 
|  | 837 | <dd> | 
|  | 838 | <p> | 
|  | 839 | Use the interactive patch selection interface to chose | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 840 | 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] | 841 | details. | 
|  | 842 | </p> | 
|  | 843 | </dd> | 
|  | 844 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 845 | -C <commit> | 
|  | 846 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 847 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 848 | --reuse-message=<commit> | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 849 | </dt> | 
|  | 850 | <dd> | 
|  | 851 | <p> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 852 | Take an existing commit object, and reuse the log message | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 853 | and the authorship information (including the timestamp) | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 854 | when creating the commit. | 
|  | 855 | </p> | 
|  | 856 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 857 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 858 | -c <commit> | 
|  | 859 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 860 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 861 | --reedit-message=<commit> | 
|  | 862 | </dt> | 
|  | 863 | <dd> | 
|  | 864 | <p> | 
|  | 865 | Like <em>-C</em>, but with <em>-c</em> the editor is invoked, so that | 
|  | 866 | the user can further edit the commit message. | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 867 | </p> | 
|  | 868 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 869 | <dt class="hdlist1"> | 
| Junio C Hamano | 2e6ded8 | 2010-12-05 06:20:48 | [diff] [blame] | 870 | --fixup=<commit> | 
|  | 871 | </dt> | 
|  | 872 | <dd> | 
|  | 873 | <p> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 874 | Construct a commit message for use with <code>rebase --autosquash</code>. | 
| Junio C Hamano | 2e6ded8 | 2010-12-05 06:20:48 | [diff] [blame] | 875 | The commit message will be the subject line from the specified | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 876 | 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] | 877 | for details. | 
|  | 878 | </p> | 
|  | 879 | </dd> | 
|  | 880 | <dt class="hdlist1"> | 
|  | 881 | --squash=<commit> | 
|  | 882 | </dt> | 
|  | 883 | <dd> | 
|  | 884 | <p> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 885 | Construct a commit message for use with <code>rebase --autosquash</code>. | 
| Junio C Hamano | 2e6ded8 | 2010-12-05 06:20:48 | [diff] [blame] | 886 | The commit message subject line is taken from the specified | 
|  | 887 | commit with a prefix of "squash! ". Can be used with additional | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 888 | 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] | 889 | <a href="git-rebase.html">git-rebase(1)</a> for details. | 
| Junio C Hamano | 2e6ded8 | 2010-12-05 06:20:48 | [diff] [blame] | 890 | </p> | 
|  | 891 | </dd> | 
|  | 892 | <dt class="hdlist1"> | 
| Junio C Hamano | 2bd8a74 | 2009-12-01 21:16:59 | [diff] [blame] | 893 | --reset-author | 
|  | 894 | </dt> | 
|  | 895 | <dd> | 
|  | 896 | <p> | 
| Junio C Hamano | a8cc1d8 | 2011-03-10 01:18:12 | [diff] [blame] | 897 | When used with -C/-c/--amend options, or when committing after a | 
|  | 898 | a conflicting cherry-pick, declare that the authorship of the | 
| Junio C Hamano | 85f1fde | 2015-06-01 20:37:32 | [diff] [blame] | 899 | resulting commit now belongs to the committer. This also renews | 
| Junio C Hamano | a8cc1d8 | 2011-03-10 01:18:12 | [diff] [blame] | 900 | the author timestamp. | 
| Junio C Hamano | 2bd8a74 | 2009-12-01 21:16:59 | [diff] [blame] | 901 | </p> | 
|  | 902 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 903 | <dt class="hdlist1"> | 
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 904 | --short | 
|  | 905 | </dt> | 
|  | 906 | <dd> | 
|  | 907 | <p> | 
|  | 908 | 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] | 909 | <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] | 910 | </p> | 
|  | 911 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 912 | <dt class="hdlist1"> | 
| Junio C Hamano | 9257a33 | 2012-06-25 20:01:02 | [diff] [blame] | 913 | --branch | 
|  | 914 | </dt> | 
|  | 915 | <dd> | 
|  | 916 | <p> | 
|  | 917 | Show the branch and tracking info even in short-format. | 
|  | 918 | </p> | 
|  | 919 | </dd> | 
|  | 920 | <dt class="hdlist1"> | 
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 921 | --porcelain | 
|  | 922 | </dt> | 
|  | 923 | <dd> | 
|  | 924 | <p> | 
|  | 925 | When doing a dry-run, give the output in a porcelain-ready | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 926 | 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] | 927 | <code>--dry-run</code>. | 
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 928 | </p> | 
|  | 929 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 930 | <dt class="hdlist1"> | 
| Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 931 | --long | 
|  | 932 | </dt> | 
|  | 933 | <dd> | 
|  | 934 | <p> | 
|  | 935 | When doing a dry-run, give the output in a the long-format. | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 936 | Implies <code>--dry-run</code>. | 
| Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 937 | </p> | 
|  | 938 | </dd> | 
|  | 939 | <dt class="hdlist1"> | 
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 940 | -z | 
|  | 941 | </dt> | 
| Junio C Hamano | 9257a33 | 2012-06-25 20:01:02 | [diff] [blame] | 942 | <dt class="hdlist1"> | 
|  | 943 | --null | 
|  | 944 | </dt> | 
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 945 | <dd> | 
|  | 946 | <p> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 947 | When showing <code>short</code> or <code>porcelain</code> status output, terminate | 
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 948 | entries in the status output with NUL, instead of LF. If no | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 949 | format is given, implies the <code>--porcelain</code> output format. | 
| Junio C Hamano | a0fae26 | 2009-12-28 09:33:50 | [diff] [blame] | 950 | </p> | 
|  | 951 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 952 | <dt class="hdlist1"> | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 953 | -F <file> | 
|  | 954 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 955 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 956 | --file=<file> | 
|  | 957 | </dt> | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 958 | <dd> | 
|  | 959 | <p> | 
|  | 960 | Take the commit message from the given file. Use <em>-</em> to | 
|  | 961 | read the message from the standard input. | 
|  | 962 | </p> | 
|  | 963 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 964 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 965 | --author=<author> | 
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 966 | </dt> | 
|  | 967 | <dd> | 
|  | 968 | <p> | 
| Junio C Hamano | 13002fb | 2010-06-08 05:53:58 | [diff] [blame] | 969 | Override the commit author. Specify an explicit author using the | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 970 | standard <code>A U Thor <author@example.com></code> format. Otherwise <author> | 
| Junio C Hamano | 13002fb | 2010-06-08 05:53:58 | [diff] [blame] | 971 | is assumed to be a pattern and is used to search for an existing | 
|  | 972 | commit by that author (i.e. rev-list --all -i --author=<author>); | 
|  | 973 | the commit author is then copied from the first such commit found. | 
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 974 | </p> | 
|  | 975 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 976 | <dt class="hdlist1"> | 
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 977 | --date=<date> | 
|  | 978 | </dt> | 
|  | 979 | <dd> | 
|  | 980 | <p> | 
|  | 981 | Override the author date used in the commit. | 
|  | 982 | </p> | 
|  | 983 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 984 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 985 | -m <msg> | 
|  | 986 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 987 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 988 | --message=<msg> | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 989 | </dt> | 
|  | 990 | <dd> | 
|  | 991 | <p> | 
|  | 992 | Use the given <msg> as the commit message. | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 993 | If multiple <code>-m</code> options are given, their values are | 
| Junio C Hamano | 09cfe6f | 2013-03-27 22:10:42 | [diff] [blame] | 994 | concatenated as separate paragraphs. | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 995 | </p> | 
|  | 996 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 997 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 998 | -t <file> | 
|  | 999 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1000 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1001 | --template=<file> | 
| Junio C Hamano | a3770f9 | 2007-07-25 08:53:33 | [diff] [blame] | 1002 | </dt> | 
|  | 1003 | <dd> | 
|  | 1004 | <p> | 
| Junio C Hamano | 51f87de | 2012-04-16 21:18:54 | [diff] [blame] | 1005 | When editing the commit message, start the editor with the | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1006 | contents in the given file. The <code>commit.template</code> configuration | 
| Junio C Hamano | 51f87de | 2012-04-16 21:18:54 | [diff] [blame] | 1007 | variable is often used to give this option implicitly to the | 
|  | 1008 | command. This mechanism can be used by projects that want to | 
|  | 1009 | guide participants with some hints on what to write in the message | 
|  | 1010 | in what order. If the user exits the editor without editing the | 
|  | 1011 | message, the commit is aborted. This has no effect when a message | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1012 | 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] | 1013 | </p> | 
|  | 1014 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1015 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1016 | -s | 
|  | 1017 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1018 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1019 | --signoff | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1020 | </dt> | 
|  | 1021 | <dd> | 
|  | 1022 | <p> | 
| Junio C Hamano | 610d176 | 2008-11-28 06:27:13 | [diff] [blame] | 1023 | Add Signed-off-by line by the committer at the end of the commit | 
| Junio C Hamano | 7d06a8a | 2008-10-20 05:42:33 | [diff] [blame] | 1024 | log message. | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1025 | </p> | 
|  | 1026 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1027 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1028 | -n | 
|  | 1029 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1030 | <dt class="hdlist1"> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1031 | --no-verify | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1032 | </dt> | 
|  | 1033 | <dd> | 
|  | 1034 | <p> | 
| Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 1035 | This option bypasses the pre-commit and commit-msg hooks. | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1036 | See also <a href="githooks.html">githooks(5)</a>. | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1037 | </p> | 
|  | 1038 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1039 | <dt class="hdlist1"> | 
| Junio C Hamano | 0c99970 | 2007-12-03 09:57:55 | [diff] [blame] | 1040 | --allow-empty | 
|  | 1041 | </dt> | 
|  | 1042 | <dd> | 
|  | 1043 | <p> | 
|  | 1044 | Usually recording a commit that has the exact same tree as its | 
| Junio C Hamano | 5825687 | 2007-12-04 08:31:13 | [diff] [blame] | 1045 | sole parent commit is a mistake, and the command prevents you | 
|  | 1046 | from making such a commit. This option bypasses the safety, and | 
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 1047 | is primarily for use by foreign SCM interface scripts. | 
| Junio C Hamano | 0c99970 | 2007-12-03 09:57:55 | [diff] [blame] | 1048 | </p> | 
|  | 1049 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1050 | <dt class="hdlist1"> | 
| Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 1051 | --allow-empty-message | 
|  | 1052 | </dt> | 
|  | 1053 | <dd> | 
|  | 1054 | <p> | 
|  | 1055 | Like --allow-empty this command is primarily for use by foreign | 
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 1056 | SCM interface scripts. It allows you to create a commit with an | 
| Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 1057 | empty commit message without using plumbing commands like | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1058 | <a href="git-commit-tree.html">git-commit-tree(1)</a>. | 
| Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 1059 | </p> | 
|  | 1060 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1061 | <dt class="hdlist1"> | 
| Junio C Hamano | 554da79 | 2007-12-27 03:29:58 | [diff] [blame] | 1062 | --cleanup=<mode> | 
|  | 1063 | </dt> | 
|  | 1064 | <dd> | 
|  | 1065 | <p> | 
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1066 | This option determines how the supplied commit message should be | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1067 | cleaned up before committing. The <em><mode></em> can be <code>strip</code>, | 
|  | 1068 | <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] | 1069 | </p> | 
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1070 | <div class="openblock"> | 
|  | 1071 | <div class="content"> | 
|  | 1072 | <div class="dlist"><dl> | 
|  | 1073 | <dt class="hdlist1"> | 
|  | 1074 | strip | 
|  | 1075 | </dt> | 
|  | 1076 | <dd> | 
|  | 1077 | <p> | 
| Junio C Hamano | e1b2859 | 2015-05-19 21:26:17 | [diff] [blame] | 1078 | Strip leading and trailing empty lines, trailing whitespace, | 
|  | 1079 | commentary and collapse consecutive empty lines. | 
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1080 | </p> | 
|  | 1081 | </dd> | 
|  | 1082 | <dt class="hdlist1"> | 
|  | 1083 | whitespace | 
|  | 1084 | </dt> | 
|  | 1085 | <dd> | 
|  | 1086 | <p> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1087 | Same as <code>strip</code> except #commentary is not removed. | 
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1088 | </p> | 
|  | 1089 | </dd> | 
|  | 1090 | <dt class="hdlist1"> | 
|  | 1091 | verbatim | 
|  | 1092 | </dt> | 
|  | 1093 | <dd> | 
|  | 1094 | <p> | 
|  | 1095 | Do not change the message at all. | 
|  | 1096 | </p> | 
|  | 1097 | </dd> | 
|  | 1098 | <dt class="hdlist1"> | 
| Junio C Hamano | 3214e5f | 2014-03-25 19:54:38 | [diff] [blame] | 1099 | scissors | 
|  | 1100 | </dt> | 
|  | 1101 | <dd> | 
|  | 1102 | <p> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1103 | Same as <code>whitespace</code>, except that everything from (and | 
| Junio C Hamano | 3214e5f | 2014-03-25 19:54:38 | [diff] [blame] | 1104 | including) the line | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1105 | "<code># ------------------------ >8 ------------------------</code>" | 
|  | 1106 | is truncated if the message is to be edited. "<code>#</code>" can be | 
| Junio C Hamano | 3214e5f | 2014-03-25 19:54:38 | [diff] [blame] | 1107 | customized with core.commentChar. | 
|  | 1108 | </p> | 
|  | 1109 | </dd> | 
|  | 1110 | <dt class="hdlist1"> | 
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1111 | default | 
|  | 1112 | </dt> | 
|  | 1113 | <dd> | 
|  | 1114 | <p> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1115 | Same as <code>strip</code> if the message is to be edited. | 
|  | 1116 | Otherwise <code>whitespace</code>. | 
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 1117 | </p> | 
|  | 1118 | </dd> | 
|  | 1119 | </dl></div> | 
|  | 1120 | </div></div> | 
|  | 1121 | <div class="paragraph"><p>The default can be changed by the <em>commit.cleanup</em> configuration | 
|  | 1122 | 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] | 1123 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1124 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1125 | -e | 
|  | 1126 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1127 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1128 | --edit | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1129 | </dt> | 
|  | 1130 | <dd> | 
|  | 1131 | <p> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1132 | The message taken from file with <code>-F</code>, command line with | 
|  | 1133 | <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] | 1134 | the commit log message unmodified. This option lets you | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1135 | further edit the message taken from these sources. | 
|  | 1136 | </p> | 
|  | 1137 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1138 | <dt class="hdlist1"> | 
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1139 | --no-edit | 
|  | 1140 | </dt> | 
|  | 1141 | <dd> | 
|  | 1142 | <p> | 
|  | 1143 | Use the selected commit message without launching an editor. | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1144 | For example, <code>git commit --amend --no-edit</code> amends a commit | 
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1145 | without changing its commit message. | 
|  | 1146 | </p> | 
|  | 1147 | </dd> | 
|  | 1148 | <dt class="hdlist1"> | 
| Junio C Hamano | bfe9e75 | 2006-04-05 21:43:28 | [diff] [blame] | 1149 | --amend | 
|  | 1150 | </dt> | 
|  | 1151 | <dd> | 
|  | 1152 | <p> | 
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 1153 | Replace the tip of the current branch by creating a new | 
|  | 1154 | commit. The recorded tree is prepared as usual (including | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1155 | 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] | 1156 | pathspec), and the message from the original commit is used | 
|  | 1157 | as the starting point, instead of an empty message, when no | 
|  | 1158 | other message is specified from the command line via options | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1159 | such as <code>-m</code>, <code>-F</code>, <code>-c</code>, etc. The new commit has the same | 
|  | 1160 | parents and author as the current one (the <code>--reset-author</code> | 
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 1161 | option can countermand this). | 
| Junio C Hamano | bfe9e75 | 2006-04-05 21:43:28 | [diff] [blame] | 1162 | </p> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1163 | <div class="openblock"> | 
|  | 1164 | <div class="content"> | 
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1165 | <div class="paragraph"><p>It is a rough equivalent for:</p></div> | 
|  | 1166 | <div class="listingblock"> | 
|  | 1167 | <div class="content"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1168 | <pre><code> $ git reset --soft HEAD^ | 
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1169 | $ ... do something else to come up with the right tree ... | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1170 | $ git commit -c ORIG_HEAD</code></pre> | 
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1171 | </div></div> | 
|  | 1172 | <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] | 1173 | </div></div> | 
| Junio C Hamano | 4eb2b9c | 2012-11-15 21:12:29 | [diff] [blame] | 1174 | <div class="paragraph"><p>You should understand the implications of rewriting history if you | 
|  | 1175 | amend a commit that has already been published. (See the "RECOVERING | 
|  | 1176 | 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] | 1177 | </dd> | 
|  | 1178 | <dt class="hdlist1"> | 
|  | 1179 | --no-post-rewrite | 
|  | 1180 | </dt> | 
|  | 1181 | <dd> | 
|  | 1182 | <p> | 
|  | 1183 | Bypass the post-rewrite hook. | 
|  | 1184 | </p> | 
|  | 1185 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1186 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1187 | -i | 
|  | 1188 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1189 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1190 | --include | 
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 1191 | </dt> | 
|  | 1192 | <dd> | 
|  | 1193 | <p> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1194 | Before making a commit out of staged contents so far, | 
|  | 1195 | stage the contents of paths given on the command line | 
|  | 1196 | as well. This is usually not what you want unless you | 
|  | 1197 | are concluding a conflicted merge. | 
| Junio C Hamano | 6697ac5 | 2006-02-14 08:00:23 | [diff] [blame] | 1198 | </p> | 
|  | 1199 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1200 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1201 | -o | 
|  | 1202 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1203 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1204 | --only | 
| Junio C Hamano | e79159d | 2008-04-12 08:23:17 | [diff] [blame] | 1205 | </dt> | 
|  | 1206 | <dd> | 
|  | 1207 | <p> | 
| Junio C Hamano | 19a0f4e | 2014-11-18 21:46:36 | [diff] [blame] | 1208 | Make a commit by taking the updated working tree contents | 
|  | 1209 | of the paths specified on the | 
| Junio C Hamano | e79159d | 2008-04-12 08:23:17 | [diff] [blame] | 1210 | command line, disregarding any contents that have been | 
| Junio C Hamano | 19a0f4e | 2014-11-18 21:46:36 | [diff] [blame] | 1211 | staged for other paths. This is the default mode of operation of | 
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1212 | <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] | 1213 | in which case this option can be omitted. | 
|  | 1214 | If this option is specified together with <em>--amend</em>, then | 
| Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 1215 | no paths need to be specified, which can be used to amend | 
| Junio C Hamano | e79159d | 2008-04-12 08:23:17 | [diff] [blame] | 1216 | the last commit without committing changes that have | 
|  | 1217 | already been staged. | 
|  | 1218 | </p> | 
|  | 1219 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1220 | <dt class="hdlist1"> | 
| Junio C Hamano | 4224f99 | 2008-06-23 07:14:08 | [diff] [blame] | 1221 | -u[<mode>] | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1222 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1223 | <dt class="hdlist1"> | 
| Junio C Hamano | 4224f99 | 2008-06-23 07:14:08 | [diff] [blame] | 1224 | --untracked-files[=<mode>] | 
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1225 | </dt> | 
|  | 1226 | <dd> | 
|  | 1227 | <p> | 
| Junio C Hamano | 36a4dbc | 2011-02-22 07:51:32 | [diff] [blame] | 1228 | Show untracked files. | 
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1229 | </p> | 
| Junio C Hamano | 36a4dbc | 2011-02-22 07:51:32 | [diff] [blame] | 1230 | <div class="paragraph"><p>The mode parameter is optional (defaults to <em>all</em>), and is used to | 
|  | 1231 | specify the handling of untracked files; when -u is not used, the | 
|  | 1232 | 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] | 1233 | <div class="paragraph"><p>The possible options are:</p></div> | 
|  | 1234 | <div class="ulist"><ul> | 
| Junio C Hamano | 4224f99 | 2008-06-23 07:14:08 | [diff] [blame] | 1235 | <li> | 
|  | 1236 | <p> | 
|  | 1237 | <em>no</em> - Show no untracked files | 
|  | 1238 | </p> | 
|  | 1239 | </li> | 
|  | 1240 | <li> | 
|  | 1241 | <p> | 
|  | 1242 | <em>normal</em> - Shows untracked files and directories | 
|  | 1243 | </p> | 
|  | 1244 | </li> | 
|  | 1245 | <li> | 
|  | 1246 | <p> | 
|  | 1247 | <em>all</em> - Also shows individual files in untracked directories. | 
|  | 1248 | </p> | 
| Junio C Hamano | 36a4dbc | 2011-02-22 07:51:32 | [diff] [blame] | 1249 | <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] | 1250 | 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] | 1251 | </li> | 
|  | 1252 | </ul></div> | 
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1253 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1254 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1255 | -v | 
|  | 1256 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1257 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1258 | --verbose | 
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1259 | </dt> | 
|  | 1260 | <dd> | 
|  | 1261 | <p> | 
|  | 1262 | Show unified diff between the HEAD commit and what | 
|  | 1263 | would be committed at the bottom of the commit message | 
| Junio C Hamano | e1b2859 | 2015-05-19 21:26:17 | [diff] [blame] | 1264 | template to help the user describe the commit by reminding | 
|  | 1265 | what changes the commit has. | 
|  | 1266 | Note that this diff output doesn’t have its | 
|  | 1267 | lines prefixed with <em>#</em>. This diff will not be a part | 
|  | 1268 | of the commit message. | 
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1269 | </p> | 
| Junio C Hamano | 5992a25 | 2015-03-17 23:39:30 | [diff] [blame] | 1270 | <div class="paragraph"><p>If specified twice, show in addition the unified diff between | 
|  | 1271 | what would be committed and the worktree files, i.e. the unstaged | 
|  | 1272 | changes to tracked files.</p></div> | 
| Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 1273 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1274 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1275 | -q | 
|  | 1276 | </dt> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1277 | <dt class="hdlist1"> | 
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 1278 | --quiet | 
| Junio C Hamano | 7d23f5e | 2006-12-16 07:44:04 | [diff] [blame] | 1279 | </dt> | 
|  | 1280 | <dd> | 
|  | 1281 | <p> | 
| Junio C Hamano | f9771f6 | 2007-01-17 17:42:30 | [diff] [blame] | 1282 | Suppress commit summary message. | 
| Junio C Hamano | 7d23f5e | 2006-12-16 07:44:04 | [diff] [blame] | 1283 | </p> | 
|  | 1284 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1285 | <dt class="hdlist1"> | 
| Junio C Hamano | 1bb3199 | 2009-08-29 04:24:08 | [diff] [blame] | 1286 | --dry-run | 
|  | 1287 | </dt> | 
|  | 1288 | <dd> | 
|  | 1289 | <p> | 
|  | 1290 | Do not create a commit, but show a list of paths that are | 
|  | 1291 | to be committed, paths with local changes that will be left | 
|  | 1292 | uncommitted and paths that are untracked. | 
|  | 1293 | </p> | 
|  | 1294 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1295 | <dt class="hdlist1"> | 
| Junio C Hamano | 6ce6b6c | 2010-01-18 01:25:50 | [diff] [blame] | 1296 | --status | 
|  | 1297 | </dt> | 
|  | 1298 | <dd> | 
|  | 1299 | <p> | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1300 | 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] | 1301 | message template when using an editor to prepare the commit | 
|  | 1302 | message. Defaults to on, but can be used to override | 
|  | 1303 | configuration variable commit.status. | 
|  | 1304 | </p> | 
|  | 1305 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1306 | <dt class="hdlist1"> | 
| Junio C Hamano | 6ce6b6c | 2010-01-18 01:25:50 | [diff] [blame] | 1307 | --no-status | 
|  | 1308 | </dt> | 
|  | 1309 | <dd> | 
|  | 1310 | <p> | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1311 | 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] | 1312 | commit message template when using an editor to prepare the | 
|  | 1313 | default commit message. | 
|  | 1314 | </p> | 
|  | 1315 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1316 | <dt class="hdlist1"> | 
| Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 1317 | -S[<keyid>] | 
|  | 1318 | </dt> | 
|  | 1319 | <dt class="hdlist1"> | 
|  | 1320 | --gpg-sign[=<keyid>] | 
|  | 1321 | </dt> | 
|  | 1322 | <dd> | 
|  | 1323 | <p> | 
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame^] | 1324 | GPG-sign commits. The <code>keyid</code> argument is optional and | 
|  | 1325 | defaults to the committer identity; if specified, it must be | 
|  | 1326 | stuck to the option without a space. | 
| Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 1327 | </p> | 
|  | 1328 | </dd> | 
|  | 1329 | <dt class="hdlist1"> | 
| Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 1330 | --no-gpg-sign | 
|  | 1331 | </dt> | 
|  | 1332 | <dd> | 
|  | 1333 | <p> | 
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1334 | Countermand <code>commit.gpgSign</code> configuration variable that is | 
| Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 1335 | set to force each and every commit to be signed. | 
|  | 1336 | </p> | 
|  | 1337 | </dd> | 
|  | 1338 | <dt class="hdlist1"> | 
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame] | 1339 | -- | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1340 | </dt> | 
|  | 1341 | <dd> | 
|  | 1342 | <p> | 
|  | 1343 | Do not interpret any more arguments as options. | 
|  | 1344 | </p> | 
|  | 1345 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1346 | <dt class="hdlist1"> | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1347 | <file>… | 
|  | 1348 | </dt> | 
|  | 1349 | <dd> | 
|  | 1350 | <p> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1351 | When files are given on the command line, the command | 
|  | 1352 | commits the contents of the named files, without | 
|  | 1353 | recording the changes already staged. The contents of | 
|  | 1354 | these files are also staged for the next commit on top | 
|  | 1355 | of what have been staged before. | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1356 | </p> | 
|  | 1357 | </dd> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1358 | </dl></div> | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1359 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1360 | </div> | 
|  | 1361 | <div class="sect1"> | 
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1362 | <h2 id="_date_formats">DATE FORMATS</h2> | 
|  | 1363 | <div class="sectionbody"> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1364 | <div class="paragraph"><p>The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1365 | and the <code>--date</code> option | 
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1366 | support the following date formats:</p></div> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1367 | <div class="dlist"><dl> | 
|  | 1368 | <dt class="hdlist1"> | 
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1369 | Git internal format | 
|  | 1370 | </dt> | 
|  | 1371 | <dd> | 
|  | 1372 | <p> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1373 | It is <code><unix timestamp> <time zone offset></code>, where <code><unix | 
|  | 1374 | timestamp></code> is the number of seconds since the UNIX epoch. | 
|  | 1375 | <code><time zone offset></code> is a positive or negative offset from UTC. | 
|  | 1376 | For example CET (which is 2 hours ahead UTC) is <code>+0200</code>. | 
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1377 | </p> | 
|  | 1378 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1379 | <dt class="hdlist1"> | 
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1380 | RFC 2822 | 
|  | 1381 | </dt> | 
|  | 1382 | <dd> | 
|  | 1383 | <p> | 
|  | 1384 | The standard email format as described by RFC 2822, for example | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1385 | <code>Thu, 07 Apr 2005 22:13:13 +0200</code>. | 
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1386 | </p> | 
|  | 1387 | </dd> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1388 | <dt class="hdlist1"> | 
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1389 | ISO 8601 | 
|  | 1390 | </dt> | 
|  | 1391 | <dd> | 
|  | 1392 | <p> | 
|  | 1393 | Time and date specified by the ISO 8601 standard, for example | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1394 | <code>2005-04-07T22:13:13</code>. The parser accepts a space instead of the | 
|  | 1395 | <code>T</code> character as well. | 
| Junio C Hamano | ae05fee | 2010-01-08 07:39:46 | [diff] [blame] | 1396 | </p> | 
|  | 1397 | <div class="admonitionblock"> | 
|  | 1398 | <table><tr> | 
|  | 1399 | <td class="icon"> | 
|  | 1400 | <div class="title">Note</div> | 
|  | 1401 | </td> | 
|  | 1402 | <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] | 1403 | <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] | 1404 | </tr></table> | 
|  | 1405 | </div> | 
|  | 1406 | </dd> | 
|  | 1407 | </dl></div> | 
|  | 1408 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1409 | </div> | 
|  | 1410 | <div class="sect1"> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1411 | <h2 id="_examples">EXAMPLES</h2> | 
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 1412 | <div class="sectionbody"> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1413 | <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] | 1414 | your working tree are temporarily stored to a staging area | 
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1415 | called the "index" with <em>git add</em>. A file can be | 
| Junio C Hamano | 361c133 | 2007-11-14 12:17:22 | [diff] [blame] | 1416 | reverted back, only in the index but not in the working tree, | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1417 | 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] | 1418 | which effectively reverts <em>git add</em> and prevents the changes to | 
| Junio C Hamano | 361c133 | 2007-11-14 12:17:22 | [diff] [blame] | 1419 | this file from participating in the next commit. After building | 
|  | 1420 | the state to be committed incrementally with these commands, | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1421 | <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] | 1422 | 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] | 1423 | command. An example:</p></div> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1424 | <div class="listingblock"> | 
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 1425 | <div class="content"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1426 | <pre><code>$ edit hello.c | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1427 | $ git rm goodbye.c | 
|  | 1428 | $ git add hello.c | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1429 | $ git commit</code></pre> | 
| Junio C Hamano | 40f2f8d | 2006-02-07 08:04:39 | [diff] [blame] | 1430 | </div></div> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1431 | <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] | 1432 | 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] | 1433 | contents are tracked in | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1434 | 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] | 1435 | for you. That is, this example does the same as the earlier | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1436 | 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] | 1437 | <div class="listingblock"> | 
|  | 1438 | <div class="content"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1439 | <pre><code>$ edit hello.c | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1440 | $ rm goodbye.c | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1441 | $ git commit -a</code></pre> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1442 | </div></div> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1443 | <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] | 1444 | notices that you have modified hello.c and removed goodbye.c, | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1445 | 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] | 1446 | <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] | 1447 | changes are recorded in, by giving pathnames to <code>git commit</code>. | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1448 | When pathnames are given, the command makes a commit that | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1449 | only records the changes made to the named paths:</p></div> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1450 | <div class="listingblock"> | 
|  | 1451 | <div class="content"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1452 | <pre><code>$ edit hello.c hello.h | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1453 | $ git add hello.c hello.h | 
|  | 1454 | $ edit Makefile | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1455 | $ git commit Makefile</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>This makes a commit that records the modification to <code>Makefile</code>. | 
|  | 1458 | 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] | 1459 | 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] | 1460 | sequence, if you do:</p></div> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1461 | <div class="listingblock"> | 
|  | 1462 | <div class="content"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1463 | <pre><code>$ git commit</code></pre> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1464 | </div></div> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1465 | <div class="paragraph"><p>this second commit would record the changes to <code>hello.c</code> and | 
|  | 1466 | <code>hello.h</code> as expected.</p></div> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1467 | <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] | 1468 | because of conflicts, cleanly merged | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1469 | paths are already staged to be committed for you, and paths that | 
|  | 1470 | conflicted are left in unmerged state. You would have to first | 
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1471 | check which paths are conflicting with <em>git status</em> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1472 | and after fixing them manually in your working tree, you would | 
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1473 | stage the result as usual with <em>git add</em>:</p></div> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1474 | <div class="listingblock"> | 
|  | 1475 | <div class="content"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1476 | <pre><code>$ git status | grep unmerged | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1477 | unmerged: hello.c | 
|  | 1478 | $ edit hello.c | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1479 | $ git add hello.c</code></pre> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1480 | </div></div> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1481 | <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] | 1482 | would stop mentioning the conflicted path. When you are done, | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1483 | run <code>git commit</code> to finally record the merge:</p></div> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1484 | <div class="listingblock"> | 
|  | 1485 | <div class="content"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1486 | <pre><code>$ git commit</code></pre> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1487 | </div></div> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1488 | <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] | 1489 | option to save typing. One difference is that during a merge | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1490 | resolution, you cannot use <code>git commit</code> with pathnames to | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1491 | alter the order the changes are committed, because the merge | 
|  | 1492 | should be recorded as a single commit. In fact, the command | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1493 | 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] | 1494 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1495 | </div> | 
|  | 1496 | <div class="sect1"> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1497 | <h2 id="_discussion">DISCUSSION</h2> | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1498 | <div class="sectionbody"> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1499 | <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] | 1500 | with a single short (less than 50 character) line summarizing the | 
|  | 1501 | change, followed by a blank line and then a more thorough description. | 
| Junio C Hamano | 281fd39 | 2012-09-17 23:57:41 | [diff] [blame] | 1502 | 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] | 1503 | as the commit title, and that title is used throughout Git. | 
| Junio C Hamano | 281fd39 | 2012-09-17 23:57:41 | [diff] [blame] | 1504 | For example, <a href="git-format-patch.html">git-format-patch(1)</a> turns a commit into email, and it uses | 
|  | 1505 | 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] | 1506 | <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] | 1507 | <div class="ulist"><ul> | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1508 | <li> | 
|  | 1509 | <p> | 
| Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 1510 | The contents of the blob objects are uninterpreted sequences | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1511 | of bytes. There is no encoding translation at the core | 
|  | 1512 | level. | 
|  | 1513 | </p> | 
|  | 1514 | </li> | 
|  | 1515 | <li> | 
|  | 1516 | <p> | 
| Junio C Hamano | d7ed404 | 2015-08-03 19:43:00 | [diff] [blame] | 1517 | Path names are encoded in UTF-8 normalization form C. This | 
|  | 1518 | applies to tree objects, the index file, ref names, as well as | 
|  | 1519 | path names in command line arguments, environment variables | 
|  | 1520 | and config files (<code>.git/config</code> (see <a href="git-config.html">git-config(1)</a>), | 
|  | 1521 | <a href="gitignore.html">gitignore(5)</a>, <a href="gitattributes.html">gitattributes(5)</a> and | 
|  | 1522 | <a href="gitmodules.html">gitmodules(5)</a>). | 
|  | 1523 | </p> | 
|  | 1524 | <div class="paragraph"><p>Note that Git at the core level treats path names simply as | 
|  | 1525 | sequences of non-NUL bytes, there are no path name encoding | 
|  | 1526 | conversions (except on Mac and Windows). Therefore, using | 
|  | 1527 | non-ASCII path names will mostly work even on platforms and file | 
|  | 1528 | systems that use legacy extended ASCII encodings. However, | 
|  | 1529 | repositories created on such systems will not work properly on | 
|  | 1530 | UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. | 
|  | 1531 | Additionally, many Git-based tools simply assume path names to | 
|  | 1532 | be UTF-8 and will fail to display other encodings correctly.</p></div> | 
|  | 1533 | </li> | 
|  | 1534 | <li> | 
|  | 1535 | <p> | 
|  | 1536 | Commit log messages are typically encoded in UTF-8, but other | 
|  | 1537 | extended ASCII encodings are also supported. This includes | 
|  | 1538 | ISO-8859-x, CP125x and many others, but <em>not</em> UTF-16/32, | 
|  | 1539 | EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5, | 
|  | 1540 | EUC-x, CP9xx etc.). | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1541 | </p> | 
|  | 1542 | </li> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1543 | </ul></div> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1544 | <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] | 1545 | 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] | 1546 | force UTF-8 on projects. If all participants of a particular | 
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1547 | project find it more convenient to use legacy encodings, Git | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1548 | 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] | 1549 | mind.</p></div> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1550 | <div class="olist arabic"><ol class="arabic"> | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1551 | <li> | 
|  | 1552 | <p> | 
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1553 | <em>git commit</em> and <em>git commit-tree</em> issues | 
| Junio C Hamano | 14b7648 | 2008-01-05 10:32:26 | [diff] [blame] | 1554 | 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] | 1555 | like a valid UTF-8 string, unless you explicitly say your | 
|  | 1556 | project uses a legacy encoding. The way to say this is to | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1557 | have i18n.commitencoding in <code>.git/config</code> file, like this: | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1558 | </p> | 
|  | 1559 | <div class="listingblock"> | 
|  | 1560 | <div class="content"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1561 | <pre><code>[i18n] | 
|  | 1562 | commitencoding = ISO-8859-1</code></pre> | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1563 | </div></div> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1564 | <div class="paragraph"><p>Commit objects created with the above setting record the value | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1565 | 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] | 1566 | help other people who look at them later. Lack of this header | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1567 | 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] | 1568 | </li> | 
|  | 1569 | <li> | 
|  | 1570 | <p> | 
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1571 | <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] | 1572 | <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] | 1573 | log message into UTF-8 unless otherwise specified. You can | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1574 | specify the desired output encoding with | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1575 | <code>i18n.logoutputencoding</code> in <code>.git/config</code> file, like this: | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1576 | </p> | 
|  | 1577 | <div class="listingblock"> | 
|  | 1578 | <div class="content"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1579 | <pre><code>[i18n] | 
|  | 1580 | logoutputencoding = ISO-8859-1</code></pre> | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1581 | </div></div> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1582 | <div class="paragraph"><p>If you do not have this configuration variable, the value of | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1583 | <code>i18n.commitencoding</code> is used instead.</p></div> | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1584 | </li> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1585 | </ol></div> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1586 | <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] | 1587 | message when a commit is made to force UTF-8 at the commit | 
|  | 1588 | object level, because re-coding to UTF-8 is not necessarily a | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1589 | reversible operation.</p></div> | 
| Junio C Hamano | 775a0f4 | 2006-12-31 01:19:14 | [diff] [blame] | 1590 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1591 | </div> | 
|  | 1592 | <div class="sect1"> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1593 | <h2 id="_environment_and_configuration_variables">ENVIRONMENT AND CONFIGURATION VARIABLES</h2> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1594 | <div class="sectionbody"> | 
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 1595 | <div class="paragraph"><p>The editor used to edit the commit log message will be chosen from the | 
| Junio C Hamano | f6002a9 | 2007-07-20 10:28:22 | [diff] [blame] | 1596 | GIT_EDITOR environment variable, the core.editor configuration variable, the | 
|  | 1597 | VISUAL environment variable, or the EDITOR environment variable (in that | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1598 | 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] | 1599 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1600 | </div> | 
|  | 1601 | <div class="sect1"> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1602 | <h2 id="_hooks">HOOKS</h2> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1603 | <div class="sectionbody"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1604 | <div class="paragraph"><p>This command can run <code>commit-msg</code>, <code>prepare-commit-msg</code>, <code>pre-commit</code>, | 
|  | 1605 | and <code>post-commit</code> hooks. See <a href="githooks.html">githooks(5)</a> for more | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1606 | information.</p></div> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1607 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1608 | </div> | 
|  | 1609 | <div class="sect1"> | 
| Junio C Hamano | 28a85be | 2012-07-24 22:05:15 | [diff] [blame] | 1610 | <h2 id="_files">FILES</h2> | 
|  | 1611 | <div class="sectionbody"> | 
|  | 1612 | <div class="dlist"><dl> | 
|  | 1613 | <dt class="hdlist1"> | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1614 | <code>$GIT_DIR/COMMIT_EDITMSG</code> | 
| Junio C Hamano | 28a85be | 2012-07-24 22:05:15 | [diff] [blame] | 1615 | </dt> | 
|  | 1616 | <dd> | 
|  | 1617 | <p> | 
|  | 1618 | This file contains the commit message of a commit in progress. | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1619 | 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] | 1620 | any commit message that has been provided by the user (e.g., in | 
|  | 1621 | an editor session) will be available in this file, but will be | 
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1622 | overwritten by the next invocation of <code>git commit</code>. | 
| Junio C Hamano | 28a85be | 2012-07-24 22:05:15 | [diff] [blame] | 1623 | </p> | 
|  | 1624 | </dd> | 
|  | 1625 | </dl></div> | 
|  | 1626 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1627 | </div> | 
|  | 1628 | <div class="sect1"> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1629 | <h2 id="_see_also">SEE ALSO</h2> | 
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1630 | <div class="sectionbody"> | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1631 | <div class="paragraph"><p><a href="git-add.html">git-add(1)</a>, | 
|  | 1632 | <a href="git-rm.html">git-rm(1)</a>, | 
|  | 1633 | <a href="git-mv.html">git-mv(1)</a>, | 
|  | 1634 | <a href="git-merge.html">git-merge(1)</a>, | 
|  | 1635 | <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] | 1636 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1637 | </div> | 
|  | 1638 | <div class="sect1"> | 
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 1639 | <h2 id="_git">GIT</h2> | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1640 | <div class="sectionbody"> | 
| Junio C Hamano | a28a920 | 2012-06-21 07:08:23 | [diff] [blame] | 1641 | <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] | 1642 | </div> | 
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 1643 | </div> | 
| Junio C Hamano | 9d97115 | 2012-12-19 00:43:11 | [diff] [blame] | 1644 | </div> | 
| Junio C Hamano | 7bd050f | 2011-09-22 06:32:22 | [diff] [blame] | 1645 | <div id="footnotes"><hr /></div> | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1646 | <div id="footer"> | 
|  | 1647 | <div id="footer-text"> | 
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame^] | 1648 | Last updated 2015-10-05 13:38:43 PDT | 
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1649 | </div> | 
|  | 1650 | </div> | 
|  | 1651 | </body> | 
|  | 1652 | </html> |