<!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="text/html; charset=UTF-8" /> | |
<meta name="generator" content="AsciiDoc 8.2.5" /> | |
<style type="text/css"> | |
/* Debug borders */ | |
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { | |
/* | |
border: 1px solid red; | |
*/ | |
} | |
body { | |
margin: 1em 5% 1em 5%; | |
} | |
a { | |
color: blue; | |
text-decoration: underline; | |
} | |
a:visited { | |
color: fuchsia; | |
} | |
em { | |
font-style: italic; | |
} | |
strong { | |
font-weight: bold; | |
} | |
tt { | |
color: navy; | |
} | |
h1, h2, h3, h4, h5, h6 { | |
color: #527bbd; | |
font-family: sans-serif; | |
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; | |
} | |
div.sectionbody { | |
font-family: serif; | |
margin-left: 0; | |
} | |
hr { | |
border: 1px solid silver; | |
} | |
p { | |
margin-top: 0.5em; | |
margin-bottom: 0.5em; | |
} | |
pre { | |
padding: 0; | |
margin: 0; | |
} | |
span#author { | |
color: #527bbd; | |
font-family: sans-serif; | |
font-weight: bold; | |
font-size: 1.1em; | |
} | |
span#email { | |
} | |
span#revision { | |
font-family: sans-serif; | |
} | |
div#footer { | |
font-family: sans-serif; | |
font-size: small; | |
border-top: 2px solid silver; | |
padding-top: 0.5em; | |
margin-top: 4.0em; | |
} | |
div#footer-text { | |
float: left; | |
padding-bottom: 0.5em; | |
} | |
div#footer-badges { | |
float: right; | |
padding-bottom: 0.5em; | |
} | |
div#preamble, | |
div.tableblock, div.imageblock, div.exampleblock, div.verseblock, | |
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, | |
div.admonitionblock { | |
margin-right: 10%; | |
margin-top: 1.5em; | |
margin-bottom: 1.5em; | |
} | |
div.admonitionblock { | |
margin-top: 2.5em; | |
margin-bottom: 2.5em; | |
} | |
div.content { /* Block element content. */ | |
padding: 0; | |
} | |
/* Block element titles. */ | |
div.title, caption.title { | |
font-family: sans-serif; | |
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 silver; | |
padding: 0.5em; | |
} | |
div.listingblock { | |
margin-right: 0%; | |
} | |
div.listingblock > div.content { | |
border: 1px solid silver; | |
background: #f4f4f4; | |
padding: 0.5em; | |
} | |
div.quoteblock > div.content { | |
padding-left: 2.0em; | |
} | |
div.attribution { | |
text-align: right; | |
} | |
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: 2px solid silver; | |
} | |
div.exampleblock > div.content { | |
border-left: 2px solid silver; | |
padding: 0.5em; | |
} | |
div.verseblock div.content { | |
white-space: pre; | |
} | |
div.imageblock div.content { padding-left: 0; } | |
div.imageblock img { border: 1px solid silver; } | |
span.image img { border-style: none; } | |
dl { | |
margin-top: 0.8em; | |
margin-bottom: 0.8em; | |
} | |
dt { | |
margin-top: 0.5em; | |
margin-bottom: 0; | |
font-style: italic; | |
} | |
dd > *:first-child { | |
margin-top: 0; | |
} | |
ul, ol { | |
list-style-position: outside; | |
} | |
div.olist2 ol { | |
list-style-type: lower-alpha; | |
} | |
div.tableblock > table { | |
border: 3px solid #527bbd; | |
} | |
thead { | |
font-family: sans-serif; | |
font-weight: bold; | |
} | |
tfoot { | |
font-weight: bold; | |
} | |
div.hlist { | |
margin-top: 0.8em; | |
margin-bottom: 0.8em; | |
} | |
div.hlist td { | |
padding-bottom: 5px; | |
} | |
td.hlist1 { | |
vertical-align: top; | |
font-style: italic; | |
padding-right: 0.8em; | |
} | |
td.hlist2 { | |
vertical-align: top; | |
} | |
@media print { | |
div#footer-badges { display: none; } | |
} | |
div#toctitle { | |
color: #527bbd; | |
font-family: sans-serif; | |
font-size: 1.1em; | |
font-weight: bold; | |
margin-top: 1.0em; | |
margin-bottom: 0.1em; | |
} | |
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; | |
} | |
include1::./stylesheets/xhtml11-manpage.css[] | |
/* Workarounds for IE6's broken and incomplete CSS2. */ | |
div.sidebar-content { | |
background: #ffffee; | |
border: 1px solid silver; | |
padding: 0.5em; | |
} | |
div.sidebar-title, div.image-title { | |
font-family: sans-serif; | |
font-weight: bold; | |
margin-top: 0.0em; | |
margin-bottom: 0.5em; | |
} | |
div.listingblock div.content { | |
border: 1px solid silver; | |
background: #f4f4f4; | |
padding: 0.5em; | |
} | |
div.quoteblock-content { | |
padding-left: 2.0em; | |
} | |
div.exampleblock-content { | |
border-left: 2px solid silver; | |
padding-left: 0.5em; | |
} | |
/* IE6 sets dynamically generated links as visited. */ | |
div#toc a:visited { color: blue; } | |
</style> | |
<title>git-commit-tree(1)</title> | |
</head> | |
<body> | |
<div id="header"> | |
<h1> | |
git-commit-tree(1) Manual Page | |
</h1> | |
<h2>NAME</h2> | |
<div class="sectionbody"> | |
<p>git-commit-tree - | |
Create a new commit object | |
</p> | |
</div> | |
</div> | |
<h2>SYNOPSIS</h2> | |
<div class="sectionbody"> | |
<div class="para"><p><em>git commit-tree</em> <tree> [-p <parent commit>]* < changelog</p></div> | |
</div> | |
<h2 id="_description">DESCRIPTION</h2> | |
<div class="sectionbody"> | |
<div class="para"><p>This is usually not what an end user wants to run directly. See | |
<a href="git-commit.html">git-commit(1)</a> instead.</p></div> | |
<div class="para"><p>Creates a new commit object based on the provided tree object and | |
emits the new commit object id on stdout.</p></div> | |
<div class="para"><p>A commit object may have any number of parents. With exactly one | |
parent, it is an ordinary commit. Having more than one parent makes | |
the commit a merge between several lines of history. Initial (root) | |
commits have no parents.</p></div> | |
<div class="para"><p>While a tree represents a particular directory state of a working | |
directory, a commit represents that state in "time", and explains how | |
to get there.</p></div> | |
<div class="para"><p>Normally a commit would identify a new "HEAD" state, and while git | |
doesn't care where you save the note about that state, in practice we | |
tend to just write the result to the file that is pointed at by | |
<tt>.git/HEAD</tt>, so that we can always see what the last committed | |
state was.</p></div> | |
</div> | |
<h2 id="_options">OPTIONS</h2> | |
<div class="sectionbody"> | |
<div class="vlist"><dl> | |
<dt> | |
<tree> | |
</dt> | |
<dd> | |
<p> | |
An existing tree object | |
</p> | |
</dd> | |
<dt> | |
-p <parent commit> | |
</dt> | |
<dd> | |
<p> | |
Each <em>-p</em> indicates the id of a parent commit object. | |
</p> | |
</dd> | |
</dl></div> | |
</div> | |
<h2 id="_commit_information">Commit Information</h2> | |
<div class="sectionbody"> | |
<div class="para"><p>A commit encapsulates:</p></div> | |
<div class="ilist"><ul> | |
<li> | |
<p> | |
all parent object ids | |
</p> | |
</li> | |
<li> | |
<p> | |
author name, email and date | |
</p> | |
</li> | |
<li> | |
<p> | |
committer name and email and the commit time. | |
</p> | |
</li> | |
</ul></div> | |
<div class="para"><p>While parent object ids are provided on the command line, author and | |
committer information is taken from the following environment variables, | |
if set:</p></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt>GIT_AUTHOR_NAME | |
GIT_AUTHOR_EMAIL | |
GIT_AUTHOR_DATE | |
GIT_COMMITTER_NAME | |
GIT_COMMITTER_EMAIL | |
GIT_COMMITTER_DATE | |
EMAIL</tt></pre> | |
</div></div> | |
<div class="para"><p>(nb "<", ">" and "\n"s are stripped)</p></div> | |
<div class="para"><p>In case (some of) these environment variables are not set, the information | |
is taken from the configuration items user.name and user.email, or, if not | |
present, system user name and fully qualified hostname.</p></div> | |
<div class="para"><p>A commit comment is read from stdin. If a changelog | |
entry is not provided via "<" redirection, <em>git-commit-tree</em> will just wait | |
for one to be entered and terminated with ^D.</p></div> | |
</div> | |
<h2 id="_diagnostics">Diagnostics</h2> | |
<div class="sectionbody"> | |
<div class="vlist"><dl> | |
<dt> | |
You don't exist. Go away! | |
</dt> | |
<dd> | |
<p> | |
The passwd(5) gecos field couldn't be read | |
</p> | |
</dd> | |
<dt> | |
Your parents must have hated you! | |
</dt> | |
<dd> | |
<p> | |
The passwd(5) gecos field is longer than a giant static buffer. | |
</p> | |
</dd> | |
<dt> | |
Your sysadmin must hate you! | |
</dt> | |
<dd> | |
<p> | |
The passwd(5) name field is longer than a giant static buffer. | |
</p> | |
</dd> | |
</dl></div> | |
</div> | |
<h2 id="_discussion">Discussion</h2> | |
<div class="sectionbody"> | |
<div class="para"><p>At the core level, git is character encoding agnostic.</p></div> | |
<div class="ilist"><ul> | |
<li> | |
<p> | |
The pathnames recorded in the index and in the tree objects | |
are treated as uninterpreted sequences of non-NUL bytes. | |
What readdir(2) returns are what are recorded and compared | |
with the data git keeps track of, which in turn are expected | |
to be what lstat(2) and creat(2) accepts. There is no such | |
thing as pathname encoding translation. | |
</p> | |
</li> | |
<li> | |
<p> | |
The contents of the blob objects are uninterpreted sequences | |
of bytes. There is no encoding translation at the core | |
level. | |
</p> | |
</li> | |
<li> | |
<p> | |
The commit log messages are uninterpreted sequences of non-NUL | |
bytes. | |
</p> | |
</li> | |
</ul></div> | |
<div class="para"><p>Although we encourage that the commit log messages are encoded | |
in UTF-8, both the core and git Porcelain are designed not to | |
force UTF-8 on projects. If all participants of a particular | |
project find it more convenient to use legacy encodings, git | |
does not forbid it. However, there are a few things to keep in | |
mind.</p></div> | |
<div class="olist"><ol> | |
<li> | |
<p> | |
<em>git-commit</em> and <em>git-commit-tree</em> issues | |
a warning if the commit log message given to it does not look | |
like a valid UTF-8 string, unless you explicitly say your | |
project uses a legacy encoding. The way to say this is to | |
have i18n.commitencoding in <tt>.git/config</tt> file, like this: | |
</p> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt>[i18n] | |
commitencoding = ISO-8859-1</tt></pre> | |
</div></div> | |
<div class="para"><p>Commit objects created with the above setting record the value | |
of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to | |
help other people who look at them later. Lack of this header | |
implies that the commit log message is encoded in UTF-8.</p></div> | |
</li> | |
<li> | |
<p> | |
<em>git-log</em>, <em>git-show</em>, <em>git-blame</em> and friends look at the | |
<tt>encoding</tt> header of a commit object, and try to re-code the | |
log message into UTF-8 unless otherwise specified. You can | |
specify the desired output encoding with | |
<tt>i18n.logoutputencoding</tt> in <tt>.git/config</tt> file, like this: | |
</p> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt>[i18n] | |
logoutputencoding = ISO-8859-1</tt></pre> | |
</div></div> | |
<div class="para"><p>If you do not have this configuration variable, the value of | |
<tt>i18n.commitencoding</tt> is used instead.</p></div> | |
</li> | |
</ol></div> | |
<div class="para"><p>Note that we deliberately chose not to re-code the commit log | |
message when a commit is made to force UTF-8 at the commit | |
object level, because re-coding to UTF-8 is not necessarily a | |
reversible operation.</p></div> | |
</div> | |
<h2 id="_see_also">SEE ALSO</h2> | |
<div class="sectionbody"> | |
<div class="para"><p><a href="git-write-tree.html">git-write-tree(1)</a></p></div> | |
</div> | |
<h2 id="_author">Author</h2> | |
<div class="sectionbody"> | |
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div> | |
</div> | |
<h2 id="_documentation">Documentation</h2> | |
<div class="sectionbody"> | |
<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> | |
</div> | |
<h2 id="_git">GIT</h2> | |
<div class="sectionbody"> | |
<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> | |
</div> | |
<div id="footer"> | |
<div id="footer-text"> | |
Last updated 2009-07-01 02:30:45 UTC | |
</div> | |
</div> | |
</body> | |
</html> |