You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1281 lines
31 KiB
HTML
1281 lines
31 KiB
HTML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
|
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
|
<head>
|
|
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
|
|
<meta name="generator" content="AsciiDoc 9.1.0" />
|
|
<title>git-am(1)</title>
|
|
<style type="text/css">
|
|
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
|
|
|
|
/* Default font. */
|
|
body {
|
|
font-family: Georgia,serif;
|
|
}
|
|
|
|
/* Title font. */
|
|
h1, h2, h3, h4, h5, h6,
|
|
div.title, caption.title,
|
|
thead, p.table.header,
|
|
#toctitle,
|
|
#author, #revnumber, #revdate, #revremark,
|
|
#footer {
|
|
font-family: Arial,Helvetica,sans-serif;
|
|
}
|
|
|
|
body {
|
|
margin: 1em 5% 1em 5%;
|
|
}
|
|
|
|
a {
|
|
color: blue;
|
|
text-decoration: underline;
|
|
}
|
|
a:visited {
|
|
color: fuchsia;
|
|
}
|
|
|
|
em {
|
|
font-style: italic;
|
|
color: navy;
|
|
}
|
|
|
|
strong {
|
|
font-weight: bold;
|
|
color: #083194;
|
|
}
|
|
|
|
h1, h2, h3, h4, h5, h6 {
|
|
color: #527bbd;
|
|
margin-top: 1.2em;
|
|
margin-bottom: 0.5em;
|
|
line-height: 1.3;
|
|
}
|
|
|
|
h1, h2, h3 {
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
h2 {
|
|
padding-top: 0.5em;
|
|
}
|
|
h3 {
|
|
float: left;
|
|
}
|
|
h3 + * {
|
|
clear: left;
|
|
}
|
|
h5 {
|
|
font-size: 1.0em;
|
|
}
|
|
|
|
div.sectionbody {
|
|
margin-left: 0;
|
|
}
|
|
|
|
hr {
|
|
border: 1px solid silver;
|
|
}
|
|
|
|
p {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
|
|
ul, ol, li > p {
|
|
margin-top: 0;
|
|
}
|
|
ul > li { color: #aaa; }
|
|
ul > li > * { color: black; }
|
|
|
|
.monospaced, code, pre {
|
|
font-family: "Courier New", Courier, monospace;
|
|
font-size: inherit;
|
|
color: navy;
|
|
padding: 0;
|
|
margin: 0;
|
|
}
|
|
pre {
|
|
white-space: pre-wrap;
|
|
}
|
|
|
|
#author {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
font-size: 1.1em;
|
|
}
|
|
#email {
|
|
}
|
|
#revnumber, #revdate, #revremark {
|
|
}
|
|
|
|
#footer {
|
|
font-size: small;
|
|
border-top: 2px solid silver;
|
|
padding-top: 0.5em;
|
|
margin-top: 4.0em;
|
|
}
|
|
#footer-text {
|
|
float: left;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
#footer-badges {
|
|
float: right;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
|
|
#preamble {
|
|
margin-top: 1.5em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.imageblock, div.exampleblock, div.verseblock,
|
|
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
|
|
div.admonitionblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.admonitionblock {
|
|
margin-top: 2.0em;
|
|
margin-bottom: 2.0em;
|
|
margin-right: 10%;
|
|
color: #606060;
|
|
}
|
|
|
|
div.content { /* Block element content. */
|
|
padding: 0;
|
|
}
|
|
|
|
/* Block element titles. */
|
|
div.title, caption.title {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
text-align: left;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
div.title + * {
|
|
margin-top: 0;
|
|
}
|
|
|
|
td div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content + div.title {
|
|
margin-top: 0.0em;
|
|
}
|
|
|
|
div.sidebarblock > div.content {
|
|
background: #ffffee;
|
|
border: 1px solid #dddddd;
|
|
border-left: 4px solid #f0f0f0;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.listingblock > div.content {
|
|
border: 1px solid #dddddd;
|
|
border-left: 5px solid #f0f0f0;
|
|
background: #f8f8f8;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.quoteblock, div.verseblock {
|
|
padding-left: 1.0em;
|
|
margin-left: 1.0em;
|
|
margin-right: 10%;
|
|
border-left: 5px solid #f0f0f0;
|
|
color: #888;
|
|
}
|
|
|
|
div.quoteblock > div.attribution {
|
|
padding-top: 0.5em;
|
|
text-align: right;
|
|
}
|
|
|
|
div.verseblock > pre.content {
|
|
font-family: inherit;
|
|
font-size: inherit;
|
|
}
|
|
div.verseblock > div.attribution {
|
|
padding-top: 0.75em;
|
|
text-align: left;
|
|
}
|
|
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
|
|
div.verseblock + div.attribution {
|
|
text-align: left;
|
|
}
|
|
|
|
div.admonitionblock .icon {
|
|
vertical-align: top;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
text-decoration: underline;
|
|
color: #527bbd;
|
|
padding-right: 0.5em;
|
|
}
|
|
div.admonitionblock td.content {
|
|
padding-left: 0.5em;
|
|
border-left: 3px solid #dddddd;
|
|
}
|
|
|
|
div.exampleblock > div.content {
|
|
border-left: 3px solid #dddddd;
|
|
padding-left: 0.5em;
|
|
}
|
|
|
|
div.imageblock div.content { padding-left: 0; }
|
|
span.image img { border-style: none; vertical-align: text-bottom; }
|
|
a.image:visited { color: white; }
|
|
|
|
dl {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
dt {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0;
|
|
font-style: normal;
|
|
color: navy;
|
|
}
|
|
dd > *:first-child {
|
|
margin-top: 0.1em;
|
|
}
|
|
|
|
ul, ol {
|
|
list-style-position: outside;
|
|
}
|
|
ol.arabic {
|
|
list-style-type: decimal;
|
|
}
|
|
ol.loweralpha {
|
|
list-style-type: lower-alpha;
|
|
}
|
|
ol.upperalpha {
|
|
list-style-type: upper-alpha;
|
|
}
|
|
ol.lowerroman {
|
|
list-style-type: lower-roman;
|
|
}
|
|
ol.upperroman {
|
|
list-style-type: upper-roman;
|
|
}
|
|
|
|
div.compact ul, div.compact ol,
|
|
div.compact p, div.compact p,
|
|
div.compact div, div.compact div {
|
|
margin-top: 0.1em;
|
|
margin-bottom: 0.1em;
|
|
}
|
|
|
|
tfoot {
|
|
font-weight: bold;
|
|
}
|
|
td > div.verse {
|
|
white-space: pre;
|
|
}
|
|
|
|
div.hdlist {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
div.hdlist tr {
|
|
padding-bottom: 15px;
|
|
}
|
|
dt.hdlist1.strong, td.hdlist1.strong {
|
|
font-weight: bold;
|
|
}
|
|
td.hdlist1 {
|
|
vertical-align: top;
|
|
font-style: normal;
|
|
padding-right: 0.8em;
|
|
color: navy;
|
|
}
|
|
td.hdlist2 {
|
|
vertical-align: top;
|
|
}
|
|
div.hdlist.compact tr {
|
|
margin: 0;
|
|
padding-bottom: 0;
|
|
}
|
|
|
|
.comment {
|
|
background: yellow;
|
|
}
|
|
|
|
.footnote, .footnoteref {
|
|
font-size: 0.8em;
|
|
}
|
|
|
|
span.footnote, span.footnoteref {
|
|
vertical-align: super;
|
|
}
|
|
|
|
#footnotes {
|
|
margin: 20px 0 20px 0;
|
|
padding: 7px 0 0 0;
|
|
}
|
|
|
|
#footnotes div.footnote {
|
|
margin: 0 0 5px 0;
|
|
}
|
|
|
|
#footnotes hr {
|
|
border: none;
|
|
border-top: 1px solid silver;
|
|
height: 1px;
|
|
text-align: left;
|
|
margin-left: 0;
|
|
width: 20%;
|
|
min-width: 100px;
|
|
}
|
|
|
|
div.colist td {
|
|
padding-right: 0.5em;
|
|
padding-bottom: 0.3em;
|
|
vertical-align: top;
|
|
}
|
|
div.colist td img {
|
|
margin-top: 0.3em;
|
|
}
|
|
|
|
@media print {
|
|
#footer-badges { display: none; }
|
|
}
|
|
|
|
#toc {
|
|
margin-bottom: 2.5em;
|
|
}
|
|
|
|
#toctitle {
|
|
color: #527bbd;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.1em;
|
|
}
|
|
|
|
div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
|
|
margin-top: 0;
|
|
margin-bottom: 0;
|
|
}
|
|
div.toclevel2 {
|
|
margin-left: 2em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel3 {
|
|
margin-left: 4em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel4 {
|
|
margin-left: 6em;
|
|
font-size: 0.9em;
|
|
}
|
|
|
|
span.aqua { color: aqua; }
|
|
span.black { color: black; }
|
|
span.blue { color: blue; }
|
|
span.fuchsia { color: fuchsia; }
|
|
span.gray { color: gray; }
|
|
span.green { color: green; }
|
|
span.lime { color: lime; }
|
|
span.maroon { color: maroon; }
|
|
span.navy { color: navy; }
|
|
span.olive { color: olive; }
|
|
span.purple { color: purple; }
|
|
span.red { color: red; }
|
|
span.silver { color: silver; }
|
|
span.teal { color: teal; }
|
|
span.white { color: white; }
|
|
span.yellow { color: yellow; }
|
|
|
|
span.aqua-background { background: aqua; }
|
|
span.black-background { background: black; }
|
|
span.blue-background { background: blue; }
|
|
span.fuchsia-background { background: fuchsia; }
|
|
span.gray-background { background: gray; }
|
|
span.green-background { background: green; }
|
|
span.lime-background { background: lime; }
|
|
span.maroon-background { background: maroon; }
|
|
span.navy-background { background: navy; }
|
|
span.olive-background { background: olive; }
|
|
span.purple-background { background: purple; }
|
|
span.red-background { background: red; }
|
|
span.silver-background { background: silver; }
|
|
span.teal-background { background: teal; }
|
|
span.white-background { background: white; }
|
|
span.yellow-background { background: yellow; }
|
|
|
|
span.big { font-size: 2em; }
|
|
span.small { font-size: 0.6em; }
|
|
|
|
span.underline { text-decoration: underline; }
|
|
span.overline { text-decoration: overline; }
|
|
span.line-through { text-decoration: line-through; }
|
|
|
|
div.unbreakable { page-break-inside: avoid; }
|
|
|
|
|
|
/*
|
|
* xhtml11 specific
|
|
*
|
|
* */
|
|
|
|
div.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.tableblock > table {
|
|
border: 3px solid #527bbd;
|
|
}
|
|
thead, p.table.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.table {
|
|
margin-top: 0;
|
|
}
|
|
/* Because the table frame attribute is overridden by CSS in most browsers. */
|
|
div.tableblock > table[frame="void"] {
|
|
border-style: none;
|
|
}
|
|
div.tableblock > table[frame="hsides"] {
|
|
border-left-style: none;
|
|
border-right-style: none;
|
|
}
|
|
div.tableblock > table[frame="vsides"] {
|
|
border-top-style: none;
|
|
border-bottom-style: none;
|
|
}
|
|
|
|
|
|
/*
|
|
* html5 specific
|
|
*
|
|
* */
|
|
|
|
table.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
thead, p.tableblock.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.tableblock {
|
|
margin-top: 0;
|
|
}
|
|
table.tableblock {
|
|
border-width: 3px;
|
|
border-spacing: 0px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
border-collapse: collapse;
|
|
}
|
|
th.tableblock, td.tableblock {
|
|
border-width: 1px;
|
|
padding: 4px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
}
|
|
|
|
table.tableblock.frame-topbot {
|
|
border-left-style: hidden;
|
|
border-right-style: hidden;
|
|
}
|
|
table.tableblock.frame-sides {
|
|
border-top-style: hidden;
|
|
border-bottom-style: hidden;
|
|
}
|
|
table.tableblock.frame-none {
|
|
border-style: hidden;
|
|
}
|
|
|
|
th.tableblock.halign-left, td.tableblock.halign-left {
|
|
text-align: left;
|
|
}
|
|
th.tableblock.halign-center, td.tableblock.halign-center {
|
|
text-align: center;
|
|
}
|
|
th.tableblock.halign-right, td.tableblock.halign-right {
|
|
text-align: right;
|
|
}
|
|
|
|
th.tableblock.valign-top, td.tableblock.valign-top {
|
|
vertical-align: top;
|
|
}
|
|
th.tableblock.valign-middle, td.tableblock.valign-middle {
|
|
vertical-align: middle;
|
|
}
|
|
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
|
|
vertical-align: bottom;
|
|
}
|
|
|
|
|
|
/*
|
|
* manpage specific
|
|
*
|
|
* */
|
|
|
|
body.manpage h1 {
|
|
padding-top: 0.5em;
|
|
padding-bottom: 0.5em;
|
|
border-top: 2px solid silver;
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
body.manpage h2 {
|
|
border-style: none;
|
|
}
|
|
body.manpage div.sectionbody {
|
|
margin-left: 3em;
|
|
}
|
|
|
|
@media print {
|
|
body.manpage div#toc { display: none; }
|
|
}
|
|
|
|
|
|
</style>
|
|
<script type="text/javascript">
|
|
/*<![CDATA[*/
|
|
var asciidoc = { // Namespace.
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// Table Of Contents generator
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
/* Author: Mihai Bazon, September 2002
|
|
* http://students.infoiasi.ro/~mishoo
|
|
*
|
|
* Table Of Content generator
|
|
* Version: 0.4
|
|
*
|
|
* Feel free to use this script under the terms of the GNU General Public
|
|
* License, as long as you do not remove or alter this notice.
|
|
*/
|
|
|
|
/* modified by Troy D. Hanson, September 2006. License: GPL */
|
|
/* modified by Stuart Rackham, 2006, 2009. License: GPL */
|
|
|
|
// toclevels = 1..4.
|
|
toc: function (toclevels) {
|
|
|
|
function getText(el) {
|
|
var text = "";
|
|
for (var i = el.firstChild; i != null; i = i.nextSibling) {
|
|
if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
|
|
text += i.data;
|
|
else if (i.firstChild != null)
|
|
text += getText(i);
|
|
}
|
|
return text;
|
|
}
|
|
|
|
function TocEntry(el, text, toclevel) {
|
|
this.element = el;
|
|
this.text = text;
|
|
this.toclevel = toclevel;
|
|
}
|
|
|
|
function tocEntries(el, toclevels) {
|
|
var result = new Array;
|
|
var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
|
|
// Function that scans the DOM tree for header elements (the DOM2
|
|
// nodeIterator API would be a better technique but not supported by all
|
|
// browsers).
|
|
var iterate = function (el) {
|
|
for (var i = el.firstChild; i != null; i = i.nextSibling) {
|
|
if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
|
|
var mo = re.exec(i.tagName);
|
|
if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
|
|
result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
|
|
}
|
|
iterate(i);
|
|
}
|
|
}
|
|
}
|
|
iterate(el);
|
|
return result;
|
|
}
|
|
|
|
var toc = document.getElementById("toc");
|
|
if (!toc) {
|
|
return;
|
|
}
|
|
|
|
// Delete existing TOC entries in case we're reloading the TOC.
|
|
var tocEntriesToRemove = [];
|
|
var i;
|
|
for (i = 0; i < toc.childNodes.length; i++) {
|
|
var entry = toc.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div'
|
|
&& entry.getAttribute("class")
|
|
&& entry.getAttribute("class").match(/^toclevel/))
|
|
tocEntriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < tocEntriesToRemove.length; i++) {
|
|
toc.removeChild(tocEntriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild TOC entries.
|
|
var entries = tocEntries(document.getElementById("content"), toclevels);
|
|
for (var i = 0; i < entries.length; ++i) {
|
|
var entry = entries[i];
|
|
if (entry.element.id == "")
|
|
entry.element.id = "_toc_" + i;
|
|
var a = document.createElement("a");
|
|
a.href = "#" + entry.element.id;
|
|
a.appendChild(document.createTextNode(entry.text));
|
|
var div = document.createElement("div");
|
|
div.appendChild(a);
|
|
div.className = "toclevel" + entry.toclevel;
|
|
toc.appendChild(div);
|
|
}
|
|
if (entries.length == 0)
|
|
toc.parentNode.removeChild(toc);
|
|
},
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// Footnotes generator
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
/* Based on footnote generation code from:
|
|
* http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
|
|
*/
|
|
|
|
footnotes: function () {
|
|
// Delete existing footnote entries in case we're reloading the footnodes.
|
|
var i;
|
|
var noteholder = document.getElementById("footnotes");
|
|
if (!noteholder) {
|
|
return;
|
|
}
|
|
var entriesToRemove = [];
|
|
for (i = 0; i < noteholder.childNodes.length; i++) {
|
|
var entry = noteholder.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
|
|
entriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < entriesToRemove.length; i++) {
|
|
noteholder.removeChild(entriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild footnote entries.
|
|
var cont = document.getElementById("content");
|
|
var spans = cont.getElementsByTagName("span");
|
|
var refs = {};
|
|
var n = 0;
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnote") {
|
|
n++;
|
|
var note = spans[i].getAttribute("data-note");
|
|
if (!note) {
|
|
// Use [\s\S] in place of . so multi-line matches work.
|
|
// Because JavaScript has no s (dotall) regex flag.
|
|
note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
|
|
spans[i].innerHTML =
|
|
"[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
spans[i].setAttribute("data-note", note);
|
|
}
|
|
noteholder.innerHTML +=
|
|
"<div class='footnote' id='_footnote_" + n + "'>" +
|
|
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
|
|
n + "</a>. " + note + "</div>";
|
|
var id =spans[i].getAttribute("id");
|
|
if (id != null) refs["#"+id] = n;
|
|
}
|
|
}
|
|
if (n == 0)
|
|
noteholder.parentNode.removeChild(noteholder);
|
|
else {
|
|
// Process footnoterefs.
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnoteref") {
|
|
var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
|
|
href = href.match(/#.*/)[0]; // Because IE return full URL.
|
|
n = refs[href];
|
|
spans[i].innerHTML =
|
|
"[<a href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
}
|
|
}
|
|
}
|
|
},
|
|
|
|
install: function(toclevels) {
|
|
var timerId;
|
|
|
|
function reinstall() {
|
|
asciidoc.footnotes();
|
|
if (toclevels) {
|
|
asciidoc.toc(toclevels);
|
|
}
|
|
}
|
|
|
|
function reinstallAndRemoveTimer() {
|
|
clearInterval(timerId);
|
|
reinstall();
|
|
}
|
|
|
|
timerId = setInterval(reinstall, 500);
|
|
if (document.addEventListener)
|
|
document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
|
|
else
|
|
window.onload = reinstallAndRemoveTimer;
|
|
}
|
|
|
|
}
|
|
asciidoc.install();
|
|
/*]]>*/
|
|
</script>
|
|
</head>
|
|
<body class="manpage">
|
|
<div id="header">
|
|
<h1>
|
|
git-am(1) Manual Page
|
|
</h1>
|
|
<h2>NAME</h2>
|
|
<div class="sectionbody">
|
|
<p>git-am -
|
|
Apply a series of patches from a mailbox
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div id="content">
|
|
<div class="sect1">
|
|
<h2 id="_synopsis">SYNOPSIS</h2>
|
|
<div class="sectionbody">
|
|
<div class="verseblock">
|
|
<pre class="content"><em>git am</em> [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
|
|
[--[no-]3way] [--interactive] [--committer-date-is-author-date]
|
|
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
|
|
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
|
|
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
|
|
[--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
|
|
[--quoted-cr=<action>]
|
|
[--empty=(stop|drop|keep)]
|
|
[(<mbox> | <Maildir>)…]
|
|
<em>git am</em> (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)</pre>
|
|
<div class="attribution">
|
|
</div></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_description">DESCRIPTION</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Splits mail messages in a mailbox into commit log message,
|
|
authorship information and patches, and applies them to the
|
|
current branch.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_options">OPTIONS</h2>
|
|
<div class="sectionbody">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
(<mbox>|<Maildir>)…
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
The list of mailbox files to read patches from. If you do not
|
|
supply this argument, the command reads from the standard input.
|
|
If you supply directories, they will be treated as Maildirs.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-s
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--signoff
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Add a <code>Signed-off-by</code> trailer to the commit message, using
|
|
the committer identity of yourself.
|
|
See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-k
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--keep
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Pass <code>-k</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--keep-non-patch
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Pass <code>-b</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--[no-]keep-cr
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
With <code>--keep-cr</code>, call <em>git mailsplit</em> (see <a href="git-mailsplit.html">git-mailsplit(1)</a>)
|
|
with the same option, to prevent it from stripping CR at the end of
|
|
lines. <code>am.keepcr</code> configuration variable can be used to specify the
|
|
default behaviour. <code>--no-keep-cr</code> is useful to override <code>am.keepcr</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-c
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--scissors
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Remove everything in body before a scissors line (see
|
|
<a href="git-mailinfo.html">git-mailinfo(1)</a>). Can be activated by default using
|
|
the <code>mailinfo.scissors</code> configuration variable.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--no-scissors
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore scissors lines (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--quoted-cr=<action>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
This flag will be passed down to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--empty=(stop|drop|keep)
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
By default, or when the option is set to <em>stop</em>, the command
|
|
errors out on an input e-mail message lacking a patch
|
|
and stops into the middle of the current am session. When this
|
|
option is set to <em>drop</em>, skip such an e-mail message instead.
|
|
When this option is set to <em>keep</em>, create an empty commit,
|
|
recording the contents of the e-mail message as its log.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-m
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--message-id
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Pass the <code>-m</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>),
|
|
so that the Message-ID header is added to the commit message.
|
|
The <code>am.messageid</code> configuration variable can be used to specify
|
|
the default behaviour.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--no-message-id
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Do not add the Message-ID header to the commit message.
|
|
<code>no-message-id</code> is useful to override <code>am.messageid</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-q
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--quiet
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Be quiet. Only print error messages.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-u
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--utf8
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Pass <code>-u</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
|
|
The proposed commit log message taken from the e-mail
|
|
is re-coded into UTF-8 encoding (configuration variable
|
|
<code>i18n.commitEncoding</code> can be used to specify project’s
|
|
preferred encoding if it is not UTF-8).
|
|
</p>
|
|
<div class="paragraph"><p>This was optional in prior versions of git, but now it is the
|
|
default. You can use <code>--no-utf8</code> to override this.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--no-utf8
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Pass <code>-n</code> flag to <em>git mailinfo</em> (see
|
|
<a href="git-mailinfo.html">git-mailinfo(1)</a>).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-3
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--3way
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--no-3way
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When the patch does not apply cleanly, fall back on
|
|
3-way merge if the patch records the identity of blobs
|
|
it is supposed to apply to and we have those blobs
|
|
available locally. <code>--no-3way</code> can be used to override
|
|
am.threeWay configuration variable. For more information,
|
|
see am.threeWay in <a href="git-config.html">git-config(1)</a>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--rerere-autoupdate
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--no-rerere-autoupdate
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
After the rerere mechanism reuses a recorded resolution on
|
|
the current conflict to update the files in the working
|
|
tree, allow it to also update the index with the result of
|
|
resolution. <code>--no-rerere-autoupdate</code> is a good way to
|
|
double-check what <code>rerere</code> did and catch potential
|
|
mismerges, before committing the result to the index with a
|
|
separate <code>git add</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--ignore-space-change
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--ignore-whitespace
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--whitespace=<option>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
-C<n>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
-p<n>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--directory=<dir>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--exclude=<path>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--include=<path>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--reject
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
These flags are passed to the <em>git apply</em> (see <a href="git-apply.html">git-apply(1)</a>)
|
|
program that applies
|
|
the patch.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--patch-format
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
By default the command will try to detect the patch format
|
|
automatically. This option allows the user to bypass the automatic
|
|
detection and specify the patch format that the patch(es) should be
|
|
interpreted as. Valid formats are mbox, mboxrd,
|
|
stgit, stgit-series and hg.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-i
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--interactive
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Run interactively.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--committer-date-is-author-date
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
By default the command records the date from the e-mail
|
|
message as the commit author date, and uses the time of
|
|
commit creation as the committer date. This allows the
|
|
user to lie about the committer date by using the same
|
|
value as the author date.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--ignore-date
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
By default the command records the date from the e-mail
|
|
message as the commit author date, and uses the time of
|
|
commit creation as the committer date. This allows the
|
|
user to lie about the author date by using the same
|
|
value as the committer date.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--skip
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Skip the current patch. This is only meaningful when
|
|
restarting an aborted patch.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-S[<keyid>]
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--gpg-sign[=<keyid>]
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--no-gpg-sign
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
GPG-sign commits. The <code>keyid</code> argument is optional and
|
|
defaults to the committer identity; if specified, it must be
|
|
stuck to the option without a space. <code>--no-gpg-sign</code> is useful to
|
|
countermand both <code>commit.gpgSign</code> configuration variable, and
|
|
earlier <code>--gpg-sign</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--continue
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
-r
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--resolved
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
After a patch failure (e.g. attempting to apply
|
|
conflicting patch), the user has applied it by hand and
|
|
the index file stores the result of the application.
|
|
Make a commit using the authorship and commit log
|
|
extracted from the e-mail message and the current index
|
|
file, and continue.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--resolvemsg=<msg>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When a patch failure occurs, <msg> will be printed
|
|
to the screen before exiting. This overrides the
|
|
standard message informing you to use <code>--continue</code>
|
|
or <code>--skip</code> to handle the failure. This is solely
|
|
for internal use between <em>git rebase</em> and <em>git am</em>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--abort
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Restore the original branch and abort the patching operation.
|
|
Revert contents of files involved in the am operation to their
|
|
pre-am state.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--quit
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Abort the patching operation but keep HEAD and the index
|
|
untouched.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--show-current-patch[=(diff|raw)]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show the message at which <code>git am</code> has stopped due to
|
|
conflicts. If <code>raw</code> is specified, show the raw contents of
|
|
the e-mail message; if <code>diff</code>, show the diff portion only.
|
|
Defaults to <code>raw</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--allow-empty
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
After a patch failure on an input e-mail message lacking a patch,
|
|
create an empty commit with the contents of the e-mail message
|
|
as its log message.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_discussion">DISCUSSION</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>The commit author name is taken from the "From: " line of the
|
|
message, and commit author date is taken from the "Date: " line
|
|
of the message. The "Subject: " line is used as the title of
|
|
the commit, after stripping common prefix "[PATCH <anything>]".
|
|
The "Subject: " line is supposed to concisely describe what the
|
|
commit is about in one line of text.</p></div>
|
|
<div class="paragraph"><p>"From: ", "Date: ", and "Subject: " lines starting the body override the
|
|
respective commit author name and title values taken from the headers.</p></div>
|
|
<div class="paragraph"><p>The commit message is formed by the title taken from the
|
|
"Subject: ", a blank line and the body of the message up to
|
|
where the patch begins. Excess whitespace at the end of each
|
|
line is automatically stripped.</p></div>
|
|
<div class="paragraph"><p>The patch is expected to be inline, directly following the
|
|
message. Any line that is of the form:</p></div>
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
three-dashes and end-of-line, or
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a line that begins with "diff -", or
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a line that begins with "Index: "
|
|
</p>
|
|
</li>
|
|
</ul></div>
|
|
<div class="paragraph"><p>is taken as the beginning of a patch, and the commit log message
|
|
is terminated before the first occurrence of such a line.</p></div>
|
|
<div class="paragraph"><p>When initially invoking <code>git am</code>, you give it the names of the mailboxes
|
|
to process. Upon seeing the first patch that does not apply, it
|
|
aborts in the middle. You can recover from this in one of two ways:</p></div>
|
|
<div class="olist arabic"><ol class="arabic">
|
|
<li>
|
|
<p>
|
|
skip the current patch by re-running the command with the <code>--skip</code>
|
|
option.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
hand resolve the conflict in the working directory, and update
|
|
the index file to bring it into a state that the patch should
|
|
have produced. Then run the command with the <code>--continue</code> option.
|
|
</p>
|
|
</li>
|
|
</ol></div>
|
|
<div class="paragraph"><p>The command refuses to process new mailboxes until the current
|
|
operation is finished, so if you decide to start over from scratch,
|
|
run <code>git am --abort</code> before running the command with mailbox
|
|
names.</p></div>
|
|
<div class="paragraph"><p>Before any patches are applied, ORIG_HEAD is set to the tip of the
|
|
current branch. This is useful if you have problems with multiple
|
|
commits, like running <em>git am</em> on the wrong branch or an error in the
|
|
commits that is more easily fixed by changing the mailbox (e.g.
|
|
errors in the "From:" lines).</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_hooks">HOOKS</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>This command can run <code>applypatch-msg</code>, <code>pre-applypatch</code>,
|
|
and <code>post-applypatch</code> hooks. See <a href="githooks.html">githooks(5)</a> for more
|
|
information.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_configuration">CONFIGURATION</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Everything below this line in this section is selectively included
|
|
from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
|
|
as what’s found there:</p></div>
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
am.keepcr
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
If true, git-am will call git-mailsplit for patches in mbox format
|
|
with parameter <code>--keep-cr</code>. In this case git-mailsplit will
|
|
not remove <code>\r</code> from lines ending with <code>\r\n</code>. Can be overridden
|
|
by giving <code>--no-keep-cr</code> from the command line.
|
|
See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
am.threeWay
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
By default, <code>git am</code> will fail if the patch does not apply cleanly. When
|
|
set to true, this setting tells <code>git am</code> to fall back on 3-way merge if
|
|
the patch records the identity of blobs it is supposed to apply to and
|
|
we have those blobs available locally (equivalent to giving the <code>--3way</code>
|
|
option from the command line). Defaults to <code>false</code>.
|
|
See <a href="git-am.html">git-am(1)</a>.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_see_also">SEE ALSO</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p><a href="git-apply.html">git-apply(1)</a>.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_git">GIT</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div id="footnotes"><hr /></div>
|
|
<div id="footer">
|
|
<div id="footer-text">
|
|
Last updated
|
|
2022-10-08 14:40:28 PDT
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|