| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" |
| 2 | "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
| 3 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> |
| 4 | <head> |
| 5 | <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame^] | 6 | <meta name="generator" content="AsciiDoc 7.0.2" /> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 7 | <style type="text/css"> |
| 8 | /* Debug borders */ |
| 9 | p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { |
| 10 | /* |
| 11 | border: 1px solid red; |
| 12 | */ |
| 13 | } |
| 14 | |
| 15 | body { |
| 16 | margin: 1em 5% 1em 5%; |
| 17 | } |
| 18 | |
| 19 | a { color: blue; } |
| 20 | a:visited { color: fuchsia; } |
| 21 | |
| 22 | em { |
| 23 | font-style: italic; |
| 24 | } |
| 25 | |
| 26 | strong { |
| 27 | font-weight: bold; |
| 28 | } |
| 29 | |
| 30 | tt { |
| 31 | color: navy; |
| 32 | } |
| 33 | |
| 34 | h1, h2, h3, h4, h5, h6 { |
| 35 | color: #527bbd; |
| 36 | font-family: sans-serif; |
| 37 | margin-top: 1.2em; |
| 38 | margin-bottom: 0.5em; |
| 39 | line-height: 1.3; |
| 40 | } |
| 41 | |
| 42 | h1 { |
| 43 | border-bottom: 2px solid silver; |
| 44 | } |
| 45 | h2 { |
| 46 | border-bottom: 2px solid silver; |
| 47 | padding-top: 0.5em; |
| 48 | } |
| 49 | |
| 50 | div.sectionbody { |
| 51 | font-family: serif; |
| 52 | margin-left: 0; |
| 53 | } |
| 54 | |
| 55 | hr { |
| 56 | border: 1px solid silver; |
| 57 | } |
| 58 | |
| 59 | p { |
| 60 | margin-top: 0.5em; |
| 61 | margin-bottom: 0.5em; |
| 62 | } |
| 63 | |
| 64 | pre { |
| 65 | padding: 0; |
| 66 | margin: 0; |
| 67 | } |
| 68 | |
| 69 | span#author { |
| 70 | color: #527bbd; |
| 71 | font-family: sans-serif; |
| 72 | font-weight: bold; |
| 73 | font-size: 1.2em; |
| 74 | } |
| 75 | span#email { |
| 76 | } |
| 77 | span#revision { |
| 78 | font-family: sans-serif; |
| 79 | } |
| 80 | |
| 81 | div#footer { |
| 82 | font-family: sans-serif; |
| 83 | font-size: small; |
| 84 | border-top: 2px solid silver; |
| 85 | padding-top: 0.5em; |
| 86 | margin-top: 4.0em; |
| 87 | } |
| 88 | div#footer-text { |
| 89 | float: left; |
| 90 | padding-bottom: 0.5em; |
| 91 | } |
| 92 | div#footer-badges { |
| 93 | float: right; |
| 94 | padding-bottom: 0.5em; |
| 95 | } |
| 96 | |
| 97 | div#preamble, |
| 98 | div.tableblock, div.imageblock, div.exampleblock, div.verseblock, |
| 99 | div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, |
| 100 | div.admonitionblock { |
| 101 | margin-right: 10%; |
| 102 | margin-top: 1.5em; |
| 103 | margin-bottom: 1.5em; |
| 104 | } |
| 105 | div.admonitionblock { |
| 106 | margin-top: 2.5em; |
| 107 | margin-bottom: 2.5em; |
| 108 | } |
| 109 | |
| 110 | div.content { /* Block element content. */ |
| 111 | padding: 0; |
| 112 | } |
| 113 | |
| 114 | /* Block element titles. */ |
| 115 | div.title, caption.title { |
| 116 | font-family: sans-serif; |
| 117 | font-weight: bold; |
| 118 | text-align: left; |
| 119 | margin-top: 1.0em; |
| 120 | margin-bottom: 0.5em; |
| 121 | } |
| 122 | div.title + * { |
| 123 | margin-top: 0; |
| 124 | } |
| 125 | |
| 126 | td div.title:first-child { |
| 127 | margin-top: 0.0em; |
| 128 | } |
| 129 | div.content div.title:first-child { |
| 130 | margin-top: 0.0em; |
| 131 | } |
| 132 | div.content + div.title { |
| 133 | margin-top: 0.0em; |
| 134 | } |
| 135 | |
| 136 | div.sidebarblock > div.content { |
| 137 | background: #ffffee; |
| 138 | border: 1px solid silver; |
| 139 | padding: 0.5em; |
| 140 | } |
| 141 | |
| 142 | div.listingblock > div.content { |
| 143 | border: 1px solid silver; |
| 144 | background: #f4f4f4; |
| 145 | padding: 0.5em; |
| 146 | } |
| 147 | |
| 148 | div.quoteblock > div.content { |
| 149 | padding-left: 2.0em; |
| 150 | } |
| 151 | div.quoteblock .attribution { |
| 152 | text-align: right; |
| 153 | } |
| 154 | |
| 155 | div.admonitionblock .icon { |
| 156 | vertical-align: top; |
| 157 | font-size: 1.1em; |
| 158 | font-weight: bold; |
| 159 | text-decoration: underline; |
| 160 | color: #527bbd; |
| 161 | padding-right: 0.5em; |
| 162 | } |
| 163 | div.admonitionblock td.content { |
| 164 | padding-left: 0.5em; |
| 165 | border-left: 2px solid silver; |
| 166 | } |
| 167 | |
| 168 | div.exampleblock > div.content { |
| 169 | border-left: 2px solid silver; |
| 170 | padding: 0.5em; |
| 171 | } |
| 172 | |
| 173 | div.verseblock div.content { |
| 174 | white-space: pre; |
| 175 | } |
| 176 | |
| 177 | div.imageblock div.content { padding-left: 0; } |
| 178 | div.imageblock img { border: 1px solid silver; } |
| 179 | span.image img { border-style: none; } |
| 180 | |
| 181 | dl { |
| 182 | margin-top: 0.8em; |
| 183 | margin-bottom: 0.8em; |
| 184 | } |
| 185 | dt { |
| 186 | margin-top: 0.5em; |
| 187 | margin-bottom: 0; |
| 188 | font-style: italic; |
| 189 | } |
| 190 | dd > *:first-child { |
| 191 | margin-top: 0; |
| 192 | } |
| 193 | |
| 194 | ul, ol { |
| 195 | list-style-position: outside; |
| 196 | } |
| 197 | ol.olist2 { |
| 198 | list-style-type: lower-alpha; |
| 199 | } |
| 200 | |
| 201 | div.tableblock > table { |
| 202 | border-color: #527bbd; |
| 203 | border-width: 3px; |
| 204 | } |
| 205 | thead { |
| 206 | font-family: sans-serif; |
| 207 | font-weight: bold; |
| 208 | } |
| 209 | tfoot { |
| 210 | font-weight: bold; |
| 211 | } |
| 212 | |
| 213 | div.hlist { |
| 214 | margin-top: 0.8em; |
| 215 | margin-bottom: 0.8em; |
| 216 | } |
| 217 | td.hlist1 { |
| 218 | vertical-align: top; |
| 219 | font-style: italic; |
| 220 | padding-right: 0.8em; |
| 221 | } |
| 222 | td.hlist2 { |
| 223 | vertical-align: top; |
| 224 | } |
| 225 | |
| 226 | @media print { |
| 227 | div#footer-badges { display: none; } |
| 228 | } |
| 229 | include::./stylesheets/xhtml11-manpage.css[] |
| 230 | /* Workarounds for IE6's broken and incomplete CSS2. */ |
| 231 | |
| 232 | div.sidebar-content { |
| 233 | background: #ffffee; |
| 234 | border: 1px solid silver; |
| 235 | padding: 0.5em; |
| 236 | } |
| 237 | div.sidebar-title, div.image-title { |
| 238 | font-family: sans-serif; |
| 239 | font-weight: bold; |
| 240 | margin-top: 0.0em; |
| 241 | margin-bottom: 0.5em; |
| 242 | } |
| 243 | |
| 244 | div.listingblock div.content { |
| 245 | border: 1px solid silver; |
| 246 | background: #f4f4f4; |
| 247 | padding: 0.5em; |
| 248 | } |
| 249 | |
| 250 | div.quoteblock-content { |
| 251 | padding-left: 2.0em; |
| 252 | } |
| 253 | |
| 254 | div.exampleblock-content { |
| 255 | border-left: 2px solid silver; |
| 256 | padding-left: 0.5em; |
| 257 | } |
| 258 | </style> |
| 259 | <title>git-merge-index(1)</title> |
| 260 | </head> |
| 261 | <body> |
| 262 | <div id="header"> |
| 263 | <h1> |
| 264 | git-merge-index(1) Manual Page |
| 265 | </h1> |
| 266 | <h2>NAME</h2> |
| 267 | <div class="sectionbody"> |
| 268 | <p>git-merge-index - |
| 269 | Runs a merge for files needing merging |
| 270 | </p> |
| 271 | </div> |
| 272 | </div> |
| 273 | <h2>SYNOPSIS</h2> |
| 274 | <div class="sectionbody"> |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame^] | 275 | <p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | -- | <file>*)</p> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 276 | </div> |
| 277 | <h2>DESCRIPTION</h2> |
| 278 | <div class="sectionbody"> |
| 279 | <p>This looks up the <file>(s) in the index and, if there are any merge |
| 280 | entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty |
| 281 | argument if no file), and <file> as argument 4. File modes for the three |
| 282 | files are passed as arguments 5, 6 and 7.</p> |
| 283 | </div> |
| 284 | <h2>OPTIONS</h2> |
| 285 | <div class="sectionbody"> |
| 286 | <dl> |
| 287 | <dt> |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame^] | 288 | -- |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 289 | </dt> |
| 290 | <dd> |
| 291 | <p> |
| 292 | Do not interpret any more arguments as options. |
| 293 | </p> |
| 294 | </dd> |
| 295 | <dt> |
| 296 | -a |
| 297 | </dt> |
| 298 | <dd> |
| 299 | <p> |
| 300 | Run merge against all files in the index that need merging. |
| 301 | </p> |
| 302 | </dd> |
| 303 | <dt> |
| 304 | -o |
| 305 | </dt> |
| 306 | <dd> |
| 307 | <p> |
| 308 | Instead of stopping at the first failed merge, do all of them |
| 309 | in one shot - continue with merging even when previous merges |
| 310 | returned errors, and only return the error code after all the |
| 311 | merges are over. |
| 312 | </p> |
| 313 | </dd> |
| 314 | <dt> |
| 315 | -q |
| 316 | </dt> |
| 317 | <dd> |
| 318 | <p> |
| 319 | Do not complain about failed merge program (the merge program |
| 320 | failure usually indicates conflicts during merge). This is for |
| 321 | porcelains which might want to emit custom messages. |
| 322 | </p> |
| 323 | </dd> |
| 324 | </dl> |
| 325 | <p>If "git-merge-index" is called with multiple <file>s (or -a) then it |
| 326 | processes them in turn only stopping if merge returns a non-zero exit |
| 327 | code.</p> |
| 328 | <p>Typically this is run with the a script calling the merge command from |
| 329 | the RCS package.</p> |
| 330 | <p>A sample script called "git-merge-one-file" is included in the |
| 331 | distribution.</p> |
| 332 | <p>ALERT ALERT ALERT! The git "merge object order" is different from the |
| 333 | RCS "merge" program merge object order. In the above ordering, the |
| 334 | original is first. But the argument order to the 3-way merge program |
| 335 | "merge" is to have the original in the middle. Don't ask me why.</p> |
| 336 | <p>Examples:</p> |
| 337 | <div class="literalblock"> |
| 338 | <div class="content"> |
| 339 | <pre><tt>torvalds@ppc970:~/merge-test> git-merge-index cat MM |
| 340 | This is MM from the original tree. # original |
| 341 | This is modified MM in the branch A. # merge1 |
| 342 | This is modified MM in the branch B. # merge2 |
| 343 | This is modified MM in the branch B. # current contents</tt></pre> |
| 344 | </div></div> |
| 345 | <p>or</p> |
| 346 | <div class="literalblock"> |
| 347 | <div class="content"> |
| 348 | <pre><tt>torvalds@ppc970:~/merge-test> git-merge-index cat AA MM |
| 349 | cat: : No such file or directory |
| 350 | This is added AA in the branch A. |
| 351 | This is added AA in the branch B. |
| 352 | This is added AA in the branch B. |
| 353 | fatal: merge program failed</tt></pre> |
| 354 | </div></div> |
| 355 | <p>where the latter example shows how "git-merge-index" will stop trying to |
| 356 | merge once anything has returned an error (ie "cat" returned an error |
| 357 | for the AA file, because it didn't exist in the original, and thus |
| 358 | "git-merge-index" didn't even try to merge the MM thing).</p> |
| 359 | </div> |
| 360 | <h2>Author</h2> |
| 361 | <div class="sectionbody"> |
| 362 | <p>Written by Linus Torvalds <torvalds@osdl.org> |
| 363 | One-shot merge by Petr Baudis <pasky@ucw.cz></p> |
| 364 | </div> |
| 365 | <h2>Documentation</h2> |
| 366 | <div class="sectionbody"> |
| 367 | <p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> |
| 368 | </div> |
| 369 | <h2>GIT</h2> |
| 370 | <div class="sectionbody"> |
| 371 | <p>Part of the <a href="git.html">git(7)</a> suite</p> |
| 372 | </div> |
| 373 | <div id="footer"> |
| 374 | <div id="footer-text"> |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame^] | 375 | Last updated 05-May-2006 23:14:13 UTC |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 376 | </div> |
| 377 | </div> |
| 378 | </body> |
| 379 | </html> |
