Autogenerated manpages for v2.47.0-305-g4083a

[git-manpages.git] / man1 / git-commit.1

'\" t
.\"     Title: git-commit
.\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets v1.79.2 <http://docbook.sf.net/>
.\"      Date: 2024-11-20
.\"    Manual: Git Manual
.\"    Source: Git 2.47.0.305.g4083a6f052
.\"  Language: English
.\"
.TH "GIT\-COMMIT" "1" "2024-11-20" "Git 2\&.47\&.0\&.305\&.g4083a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el       .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
git-commit \- Record changes to the repository
.SH "SYNOPSIS"
.sp
.nf
\fIgit commit\fR [\-a | \-\-interactive | \-\-patch] [\-s] [\-v] [\-u<mode>] [\-\-amend]
           [\-\-dry\-run] [(\-c | \-C | \-\-squash) <commit> | \-\-fixup [(amend|reword):]<commit>]
           [\-F <file> | \-m <msg>] [\-\-reset\-author] [\-\-allow\-empty]
           [\-\-allow\-empty\-message] [\-\-no\-verify] [\-e] [\-\-author=<author>]
           [\-\-date=<date>] [\-\-cleanup=<mode>] [\-\-[no\-]status]
           [\-i | \-o] [\-\-pathspec\-from\-file=<file> [\-\-pathspec\-file\-nul]]
           [(\-\-trailer <token>[(=|:)<value>])\&...\:] [\-S[<keyid>]]
           [\-\-] [<pathspec>\&...\:]
.fi
.SH "DESCRIPTION"
.sp
Create a new commit containing the current contents of the index and the given log message describing the changes\&. The new commit is a direct child of HEAD, usually the tip of the current branch, and the branch is updated to point to it (unless no branch is associated with the working tree, in which case HEAD is "detached" as described in \fBgit-checkout\fR(1))\&.
.sp
The content to be committed can be specified in several ways:
.sp
.RS 4
.ie n \{\
\h'-04' 1.\h'+01'\c
.\}
.el \{\
.sp -1
.IP "  1." 4.2
.\}
by using
\fBgit-add\fR(1)
to incrementally "add" changes to the index before using the
\fIcommit\fR
command (Note: even modified files must be "added");
.RE
.sp
.RS 4
.ie n \{\
\h'-04' 2.\h'+01'\c
.\}
.el \{\
.sp -1
.IP "  2." 4.2
.\}
by using
\fBgit-rm\fR(1)
to remove files from the working tree and the index, again before using the
\fIcommit\fR
command;
.RE
.sp
.RS 4
.ie n \{\
\h'-04' 3.\h'+01'\c
.\}
.el \{\
.sp -1
.IP "  3." 4.2
.\}
by listing files as arguments to the
\fIcommit\fR
command (without \-\-interactive or \-\-patch switch), in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files (which must already be known to Git);
.RE
.sp
.RS 4
.ie n \{\
\h'-04' 4.\h'+01'\c
.\}
.el \{\
.sp -1
.IP "  4." 4.2
.\}
by using the \-a switch with the
\fIcommit\fR
command to automatically "add" changes from all known files (i\&.e\&. all files that are already listed in the index) and to automatically "rm" files in the index that have been removed from the working tree, and then perform the actual commit;
.RE
.sp
.RS 4
.ie n \{\
\h'-04' 5.\h'+01'\c
.\}
.el \{\
.sp -1
.IP "  5." 4.2
.\}
by using the \-\-interactive or \-\-patch switches with the
\fIcommit\fR
command to decide one by one which files or hunks should be part of the commit in addition to contents in the index, before finalizing the operation\&. See the
\(lqInteractive Mode\(rq
section of
\fBgit-add\fR(1)
to learn how to operate these modes\&.
.RE
.sp
The \fB\-\-dry\-run\fR option can be used to obtain a summary of what is included by any of the above for the next commit by giving the same set of parameters (options and paths)\&.
.sp
If you make a commit and then find a mistake immediately after that, you can recover from it with \fIgit reset\fR\&.
.SH "OPTIONS"
.PP
\-a, \-\-all
.RS 4
Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected\&.
.RE
.PP
\-p, \-\-patch
.RS 4
Use the interactive patch selection interface to choose which changes to commit\&. See
\fBgit-add\fR(1)
for details\&.
.RE
.PP
\-C <commit>, \-\-reuse\-message=<commit>
.RS 4
Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit\&.
.RE
.PP
\-c <commit>, \-\-reedit\-message=<commit>
.RS 4
Like
\fI\-C\fR, but with
\fB\-c\fR
the editor is invoked, so that the user can further edit the commit message\&.
.RE
.PP
\-\-fixup=[(amend|reword):]<commit>
.RS 4
Create a new commit which "fixes up"
\fI<commit>\fR
when applied with
\fBgit\fR
\fBrebase\fR
\fB\-\-autosquash\fR\&. Plain
\fB\-\-fixup=\fR\fI<commit>\fR
creates a "fixup!" commit which changes the content of
\fI<commit>\fR
but leaves its log message untouched\&.
\fB\-\-fixup=amend:\fR\fI<commit>\fR
is similar but creates an "amend!" commit which also replaces the log message of
\fI<commit>\fR
with the log message of the "amend!" commit\&.
\fB\-\-fixup=reword:\fR\fI<commit>\fR
creates an "amend!" commit which replaces the log message of
\fI<commit>\fR
with its own log message but makes no changes to the content of
\fI<commit>\fR\&.
.sp
The commit created by plain
\fB\-\-fixup=\fR\fI<commit>\fR
has a subject composed of "fixup!" followed by the subject line from <commit>, and is recognized specially by
\fBgit\fR
\fBrebase\fR
\fB\-\-autosquash\fR\&. The
\fB\-m\fR
option may be used to supplement the log message of the created commit, but the additional commentary will be thrown away once the "fixup!" commit is squashed into
\fI<commit>\fR
by
\fBgit\fR
\fBrebase\fR
\fB\-\-autosquash\fR\&.
.sp
The commit created by
\fB\-\-fixup=amend:\fR\fI<commit>\fR
is similar but its subject is instead prefixed with "amend!"\&. The log message of <commit> is copied into the log message of the "amend!" commit and opened in an editor so it can be refined\&. When
\fBgit\fR
\fBrebase\fR
\fB\-\-autosquash\fR
squashes the "amend!" commit into
\fI<commit>\fR, the log message of
\fI<commit>\fR
is replaced by the refined log message from the "amend!" commit\&. It is an error for the "amend!" commit\(cqs log message to be empty unless
\fB\-\-allow\-empty\-message\fR
is specified\&.
.sp
\fB\-\-fixup=reword:\fR\fI<commit>\fR
is shorthand for
\fB\-\-fixup=amend:\fR\fI<commit>\fR
\fB\-\-only\fR\&. It creates an "amend!" commit with only a log message (ignoring any changes staged in the index)\&. When squashed by
\fBgit\fR
\fBrebase\fR
\fB\-\-autosquash\fR, it replaces the log message of
\fI<commit>\fR
without making any other changes\&.
.sp
Neither "fixup!" nor "amend!" commits change authorship of
\fI<commit>\fR
when applied by
\fBgit\fR
\fBrebase\fR
\fB\-\-autosquash\fR\&. See
\fBgit-rebase\fR(1)
for details\&.
.RE
.PP
\-\-squash=<commit>
.RS 4
Construct a commit message for use with
\fBrebase\fR
\fB\-\-autosquash\fR\&. The commit message subject line is taken from the specified commit with a prefix of "squash! "\&. Can be used with additional commit message options (\fB\-m\fR/\fB\-c\fR/\fB\-C\fR/\fB\-F\fR)\&. See
\fBgit-rebase\fR(1)
for details\&.
.RE
.PP
\-\-reset\-author
.RS 4
When used with \-C/\-c/\-\-amend options, or when committing after a conflicting cherry\-pick, declare that the authorship of the resulting commit now belongs to the committer\&. This also renews the author timestamp\&.
.RE
.PP
\-\-short
.RS 4
When doing a dry\-run, give the output in the short\-format\&. See
\fBgit-status\fR(1)
for details\&. Implies
\fB\-\-dry\-run\fR\&.
.RE
.PP
\-\-branch
.RS 4
Show the branch and tracking info even in short\-format\&.
.RE
.PP
\-\-porcelain
.RS 4
When doing a dry\-run, give the output in a porcelain\-ready format\&. See
\fBgit-status\fR(1)
for details\&. Implies
\fB\-\-dry\-run\fR\&.
.RE
.PP
\-\-long
.RS 4
When doing a dry\-run, give the output in the long\-format\&. Implies
\fB\-\-dry\-run\fR\&.
.RE
.PP
\-z, \-\-null
.RS 4
When showing
\fBshort\fR
or
\fBporcelain\fR
status output, print the filename verbatim and terminate the entries with NUL, instead of LF\&. If no format is given, implies the
\fB\-\-porcelain\fR
output format\&. Without the
\fB\-z\fR
option, filenames with "unusual" characters are quoted as explained for the configuration variable
\fBcore\&.quotePath\fR
(see
\fBgit-config\fR(1))\&.
.RE
.PP
\-F <file>, \-\-file=<file>
.RS 4
Take the commit message from the given file\&. Use
\fI\-\fR
to read the message from the standard input\&.
.RE
.PP
\-\-author=<author>
.RS 4
Override the commit author\&. Specify an explicit author using the standard
\fBA\fR
\fBU\fR
\fBThor\fR
<author@example\&.\fBcom\fR> format\&. Otherwise <author> is assumed to be a pattern and is used to search for an existing commit by that author (i\&.e\&. rev\-list \-\-all \-i \-\-author=<author>); the commit author is then copied from the first such commit found\&.
.RE
.PP
\-\-date=<date>
.RS 4
Override the author date used in the commit\&.
.RE
.PP
\-m <msg>, \-\-message=<msg>
.RS 4
Use the given <msg> as the commit message\&. If multiple
\fB\-m\fR
options are given, their values are concatenated as separate paragraphs\&.
.sp
The
\fB\-m\fR
option is mutually exclusive with
\fB\-c\fR,
\fB\-C\fR, and
\fB\-F\fR\&.
.RE
.PP
\-t <file>, \-\-template=<file>
.RS 4
When editing the commit message, start the editor with the contents in the given file\&. The
\fBcommit\&.template\fR
configuration variable is often used to give this option implicitly to the command\&. This mechanism can be used by projects that want to guide participants with some hints on what to write in the message in what order\&. If the user exits the editor without editing the message, the commit is aborted\&. This has no effect when a message is given by other means, e\&.g\&. with the
\fB\-m\fR
or
\fB\-F\fR
options\&.
.RE
.PP
\-s, \-\-signoff, \-\-no\-signoff
.RS 4
Add a
\fBSigned\-off\-by\fR
trailer by the committer at the end of the commit log message\&. The meaning of a signoff depends on the project to which you\(cqre committing\&. For example, it may certify that the committer has the rights to submit the work under the project\(cqs license or agrees to some contributor representation, such as a Developer Certificate of Origin\&. (See
\m[blue]\fBhttps://developercertificate\&.org\fR\m[]
for the one used by the Linux kernel and Git projects\&.) Consult the documentation or leadership of the project to which you\(cqre contributing to understand how the signoffs are used in that project\&.
.sp
The \-\-no\-signoff option can be used to countermand an earlier \-\-signoff option on the command line\&.
.RE
.PP
\-\-trailer <token>[(=|:)<value>]
.RS 4
Specify a (<token>, <value>) pair that should be applied as a trailer\&. (e\&.g\&.
\fBgit\fR
\fBcommit\fR
\fB\-\-trailer\fR
"Signed\-off\-by:C
\fBO\fR
\fBMitter\fR
\e <committer@example\&.\fBcom\fR>"
\fB\-\-trailer\fR
"Helped\-by:C
\fBO\fR
\fBMitter\fR
\e <committer@example\&.\fBcom\fR>" will add the "Signed\-off\-by" trailer and the "Helped\-by" trailer to the commit message\&.) The
\fBtrailer\&.\fR* configuration variables (\fBgit-interpret-trailers\fR(1)) can be used to define if a duplicated trailer is omitted, where in the run of trailers each trailer would appear, and other details\&.
.RE
.PP
\-n, \-\-[no\-]verify
.RS 4
By default, the pre\-commit and commit\-msg hooks are run\&. When any of
\fB\-\-no\-verify\fR
or
\fB\-n\fR
is given, these are bypassed\&. See also
\fBgithooks\fR(5)\&.
.RE
.PP
\-\-allow\-empty
.RS 4
Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit\&. This option bypasses the safety, and is primarily for use by foreign SCM interface scripts\&.
.RE
.PP
\-\-allow\-empty\-message
.RS 4
Like \-\-allow\-empty this command is primarily for use by foreign SCM interface scripts\&. It allows you to create a commit with an empty commit message without using plumbing commands like
\fBgit-commit-tree\fR(1)\&.
.RE
.PP
\-\-cleanup=<mode>
.RS 4
This option determines how the supplied commit message should be cleaned up before committing\&. The
\fI<mode>\fR
can be
\fBstrip\fR,
\fBwhitespace\fR,
\fBverbatim\fR,
\fBscissors\fR
or
\fBdefault\fR\&.
.PP
strip
.RS 4
Strip leading and trailing empty lines, trailing whitespace, commentary and collapse consecutive empty lines\&.
.RE
.PP
whitespace
.RS 4
Same as
\fBstrip\fR
except #commentary is not removed\&.
.RE
.PP
verbatim
.RS 4
Do not change the message at all\&.
.RE
.PP
scissors
.RS 4
Same as
\fBwhitespace\fR
except that everything from (and including) the line found below is truncated, if the message is to be edited\&. "#" can be customized with core\&.commentChar\&.
.sp
.if n \{\
.RS 4
.\}
.nf
# \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- >8 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
.fi
.if n \{\
.RE
.\}
.RE
.PP
default
.RS 4
Same as
\fBstrip\fR
if the message is to be edited\&. Otherwise
\fBwhitespace\fR\&.
.RE
.sp
The default can be changed by the
\fBcommit\&.cleanup\fR
configuration variable (see
\fBgit-config\fR(1))\&.
.RE
.PP
\-e, \-\-edit
.RS 4
The message taken from file with
\fB\-F\fR, command line with
\fB\-m\fR, and from commit object with
\fB\-C\fR
are usually used as the commit log message unmodified\&. This option lets you further edit the message taken from these sources\&.
.RE
.PP
\-\-no\-edit
.RS 4
Use the selected commit message without launching an editor\&. For example,
\fBgit\fR
\fBcommit\fR
\fB\-\-amend\fR
\fB\-\-no\-edit\fR
amends a commit without changing its commit message\&.
.RE
.PP
\-\-amend
.RS 4
Replace the tip of the current branch by creating a new commit\&. The recorded tree is prepared as usual (including the effect of the
\fB\-i\fR
and
\fB\-o\fR
options and explicit pathspec), and the message from the original commit is used as the starting point, instead of an empty message, when no other message is specified from the command line via options such as
\fB\-m\fR,
\fB\-F\fR,
\fB\-c\fR, etc\&. The new commit has the same parents and author as the current one (the
\fB\-\-reset\-author\fR
option can countermand this)\&.
.sp
It is a rough equivalent for:
.sp
.if n \{\
.RS 4
.\}
.nf
        $ git reset \-\-soft HEAD^
        $ \&.\&.\&. do something else to come up with the right tree \&.\&.\&.
        $ git commit \-c ORIG_HEAD
.fi
.if n \{\
.RE
.\}
.sp
but can be used to amend a merge commit\&.
.sp
You should understand the implications of rewriting history if you amend a commit that has already been published\&. (See the "RECOVERING FROM UPSTREAM REBASE" section in
\fBgit-rebase\fR(1)\&.)
.RE
.PP
\-\-no\-post\-rewrite
.RS 4
Bypass the post\-rewrite hook\&.
.RE
.PP
\-i, \-\-include
.RS 4
Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well\&. This is usually not what you want unless you are concluding a conflicted merge\&.
.RE
.PP
\-o, \-\-only
.RS 4
Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths\&. This is the default mode of operation of
\fIgit commit\fR
if any paths are given on the command line, in which case this option can be omitted\&. If this option is specified together with
\fB\-\-amend\fR, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged\&. If used together with
\fB\-\-allow\-empty\fR
paths are also not required, and an empty commit will be created\&.
.RE
.PP
\-\-pathspec\-from\-file=<file>
.RS 4
Pathspec is passed in
\fI<file>\fR
instead of commandline args\&. If
\fI<file>\fR
is exactly
\fB\-\fR
then standard input is used\&. Pathspec elements are separated by LF or CR/LF\&. Pathspec elements can be quoted as explained for the configuration variable
\fBcore\&.quotePath\fR
(see
\fBgit-config\fR(1))\&. See also
\fB\-\-pathspec\-file\-nul\fR
and global
\fB\-\-literal\-pathspecs\fR\&.
.RE
.PP
\-\-pathspec\-file\-nul
.RS 4
Only meaningful with
\fB\-\-pathspec\-from\-file\fR\&. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)\&.
.RE
.PP
\-u[<mode>], \-\-untracked\-files[=<mode>]
.RS 4
Show untracked files\&.
.sp
The mode parameter is optional (defaults to
\fIall\fR), and is used to specify the handling of untracked files; when \-u is not used, the default is
\fInormal\fR, i\&.e\&. show untracked files and directories\&.
.sp
The possible options are:
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fIno\fR
\- Show no untracked files
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fInormal\fR
\- Shows untracked files and directories
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
\fIall\fR
\- Also shows individual files in untracked directories\&.
.RE
.sp
All usual spellings for Boolean value
\fBtrue\fR
are taken as
\fBnormal\fR
and
\fBfalse\fR
as
\fBno\fR\&. The default can be changed using the status\&.showUntrackedFiles configuration variable documented in
\fBgit-config\fR(1)\&.
.RE
.PP
\-v, \-\-verbose
.RS 4
Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has\&. Note that this diff output doesn\(cqt have its lines prefixed with
\fI#\fR\&. This diff will not be a part of the commit message\&. See the
\fBcommit\&.verbose\fR
configuration variable in
\fBgit-config\fR(1)\&.
.sp
If specified twice, show in addition the unified diff between what would be committed and the worktree files, i\&.e\&. the unstaged changes to tracked files\&.
.RE
.PP
\-q, \-\-quiet
.RS 4
Suppress commit summary message\&.
.RE
.PP
\-\-dry\-run
.RS 4
Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked\&.
.RE
.PP
\-\-status
.RS 4
Include the output of
\fBgit-status\fR(1)
in the commit message template when using an editor to prepare the commit message\&. Defaults to on, but can be used to override configuration variable commit\&.status\&.
.RE
.PP
\-\-no\-status
.RS 4
Do not include the output of
\fBgit-status\fR(1)
in the commit message template when using an editor to prepare the default commit message\&.
.RE
.PP
\-S[<keyid>], \-\-gpg\-sign[=<keyid>], \-\-no\-gpg\-sign
.RS 4
GPG\-sign commits\&. The
\fBkeyid\fR
argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space\&.
\fB\-\-no\-gpg\-sign\fR
is useful to countermand both
\fBcommit\&.gpgSign\fR
configuration variable, and earlier
\fB\-\-gpg\-sign\fR\&.
.RE
.PP
\-\-
.RS 4
Do not interpret any more arguments as options\&.
.RE
.PP
<pathspec>\&...\:
.RS 4
When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index\&. The contents of these files are also staged for the next commit on top of what have been staged before\&.
.sp
For more details, see the
\fIpathspec\fR
entry in
\fBgitglossary\fR(7)\&.
.RE
.SH "EXAMPLES"
.sp
When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the "index" with \fIgit add\fR\&. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with \fBgit\fR \fBrestore\fR \fB\-\-staged\fR \fI<file>\fR, which effectively reverts \fIgit add\fR and prevents the changes to this file from participating in the next commit\&. After building the state to be committed incrementally with these commands, \fBgit\fR \fBcommit\fR (without any pathname parameter) is used to record what has been staged so far\&. This is the most basic form of the command\&. An example:
.sp
.if n \{\
.RS 4
.\}
.nf
$ edit hello\&.c
$ git rm goodbye\&.c
$ git add hello\&.c
$ git commit
.fi
.if n \{\
.RE
.\}
.sp
Instead of staging files after each individual change, you can tell \fBgit\fR \fBcommit\fR to notice the changes to the files whose contents are tracked in your working tree and do corresponding \fBgit\fR \fBadd\fR and \fBgit\fR \fBrm\fR for you\&. That is, this example does the same as the earlier example if there is no other change in your working tree:
.sp
.if n \{\
.RS 4
.\}
.nf
$ edit hello\&.c
$ rm goodbye\&.c
$ git commit \-a
.fi
.if n \{\
.RE
.\}
.sp
The command \fBgit\fR \fBcommit\fR \fB\-a\fR first looks at your working tree, notices that you have modified hello\&.c and removed goodbye\&.c, and performs necessary \fBgit\fR \fBadd\fR and \fBgit\fR \fBrm\fR for you\&.
.sp
After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to \fBgit\fR \fBcommit\fR\&. When pathnames are given, the command makes a commit that only records the changes made to the named paths:
.sp
.if n \{\
.RS 4
.\}
.nf
$ edit hello\&.c hello\&.h
$ git add hello\&.c hello\&.h
$ edit Makefile
$ git commit Makefile
.fi
.if n \{\
.RE
.\}
.sp
This makes a commit that records the modification to \fBMakefile\fR\&. The changes staged for \fBhello\&.c\fR and \fBhello\&.h\fR are not included in the resulting commit\&. However, their changes are not lost \(em they are still staged and merely held back\&. After the above sequence, if you do:
.sp
.if n \{\
.RS 4
.\}
.nf
$ git commit
.fi
.if n \{\
.RE
.\}
.sp
this second commit would record the changes to \fBhello\&.c\fR and \fBhello\&.h\fR as expected\&.
.sp
After a merge (initiated by \fIgit merge\fR or \fIgit pull\fR) stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state\&. You would have to first check which paths are conflicting with \fIgit status\fR and after fixing them manually in your working tree, you would stage the result as usual with \fIgit add\fR:
.sp
.if n \{\
.RS 4
.\}
.nf
$ git status | grep unmerged
unmerged: hello\&.c
$ edit hello\&.c
$ git add hello\&.c
.fi
.if n \{\
.RE
.\}
.sp
After resolving conflicts and staging the result, \fBgit\fR \fBls\-files\fR \fB\-u\fR would stop mentioning the conflicted path\&. When you are done, run \fBgit\fR \fBcommit\fR to finally record the merge:
.sp
.if n \{\
.RS 4
.\}
.nf
$ git commit
.fi
.if n \{\
.RE
.\}
.sp
As with the case to record your own changes, you can use \fB\-a\fR option to save typing\&. One difference is that during a merge resolution, you cannot use \fBgit\fR \fBcommit\fR with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit\&. In fact, the command refuses to run when given pathnames (but see \fB\-i\fR option)\&.
.SH "COMMIT INFORMATION"
.sp
Author and committer information is taken from the following environment variables, if set:
.sp
.if n \{\
.RS 4
.\}
.nf
GIT_AUTHOR_NAME
GIT_AUTHOR_EMAIL
GIT_AUTHOR_DATE
GIT_COMMITTER_NAME
GIT_COMMITTER_EMAIL
GIT_COMMITTER_DATE
.fi
.if n \{\
.RE
.\}
.sp
(nb "<", ">" and "\en"s are stripped)
.sp
The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form\&. Arbitrary Unicode may be used, subject to the constraints listed above\&. This name has no effect on authentication; for that, see the \fBcredential\&.username\fR variable in \fBgit-config\fR(1)\&.
.sp
In case (some of) these environment variables are not set, the information is taken from the configuration items \fBuser\&.name\fR and \fBuser\&.email\fR, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from \fB/etc/mailname\fR and falling back to the fully qualified hostname when that file does not exist)\&.
.sp
The \fBauthor\&.name\fR and \fBcommitter\&.name\fR and their corresponding email options override \fBuser\&.name\fR and \fBuser\&.email\fR if set and are overridden themselves by the environment variables\&.
.sp
The typical usage is to set just the \fBuser\&.name\fR and \fBuser\&.email\fR variables; the other options are provided for more complex use cases\&.
.SH "DATE FORMATS"
.sp
The \fBGIT_AUTHOR_DATE\fR and \fBGIT_COMMITTER_DATE\fR environment variables support the following date formats:
.PP
Git internal format
.RS 4
It is
\fI<unix\-timestamp>\fR
\fI<time\-zone\-offset>\fR, where
\fI<unix\-timestamp>\fR
is the number of seconds since the UNIX epoch\&.
\fI<time\-zone\-offset>\fR
is a positive or negative offset from UTC\&. For example CET (which is 1 hour ahead of UTC) is
\fB+0100\fR\&.
.RE
.PP
RFC 2822
.RS 4
The standard date format as described by RFC 2822, for example
\fBThu,\fR
\fB07\fR
\fBApr\fR
\fB2005\fR
\fB22:13:13\fR
\fB+0200\fR\&.
.RE
.PP
ISO 8601
.RS 4
Time and date specified by the ISO 8601 standard, for example
\fB2005\-04\-07T22:13:13\fR\&. The parser accepts a space instead of the
\fBT\fR
character as well\&. Fractional parts of a second will be ignored, for example
\fB2005\-04\-07T22:13:13\&.019\fR
will be treated as
\fB2005\-04\-07T22:13:13\fR\&.
.if n \{\
.sp
.\}
.RS 4
.it 1 an-trap
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
.ps +1
\fBNote\fR
.ps -1
.br
In addition, the date part is accepted in the following formats:
\fBYYYY\&.MM\&.DD\fR,
\fBMM/DD/YYYY\fR
and
\fBDD\&.MM\&.YYYY\fR\&.
.sp .5v
.RE
.RE
.sp
In addition to recognizing all date formats above, the \fB\-\-date\fR option will also try to make sense of other, more human\-centric date formats, such as relative dates like "yesterday" or "last Friday at noon"\&.
.SH "DISCUSSION"
.sp
Though not required, it\(cqs a good idea to begin the commit message with a single short (no more than 50 characters) line summarizing the change, followed by a blank line and then a more thorough description\&. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git\&. For example, \fBgit-format-patch\fR(1) turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body\&.
.sp
Git is to some extent character encoding agnostic\&.
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
The contents of the blob objects are uninterpreted sequences of bytes\&. There is no encoding translation at the core level\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Path names are encoded in UTF\-8 normalization form C\&. This applies to tree objects, the index file, ref names, as well as path names in command line arguments, environment variables and config files (\&.\fBgit/config\fR
(see
\fBgit-config\fR(1)),
\fBgitignore\fR(5),
\fBgitattributes\fR(5)
and
\fBgitmodules\fR(5))\&.
.sp
Note that Git at the core level treats path names simply as sequences of non\-NUL bytes, there are no path name encoding conversions (except on Mac and Windows)\&. Therefore, using non\-ASCII path names will mostly work even on platforms and file systems that use legacy extended ASCII encodings\&. However, repositories created on such systems will not work properly on UTF\-8\-based systems (e\&.g\&. Linux, Mac, Windows) and vice versa\&. Additionally, many Git\-based tools simply assume path names to be UTF\-8 and will fail to display other encodings correctly\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
Commit log messages are typically encoded in UTF\-8, but other extended ASCII encodings are also supported\&. This includes ISO\-8859\-x, CP125x and many others, but
\fInot\fR
UTF\-16/32, EBCDIC and CJK multi\-byte encodings (GBK, Shift\-JIS, Big5, EUC\-x, CP9xx etc\&.)\&.
.RE
.sp
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\&.
.sp
.RS 4
.ie n \{\
\h'-04' 1.\h'+01'\c
.\}
.el \{\
.sp -1
.IP "  1." 4.2
.\}
\fIgit commit\fR
and
\fIgit commit\-tree\fR
issue 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
\fBi18n\&.commitEncoding\fR
in \&.\fBgit/config\fR
file, like this:
.sp
.if n \{\
.RS 4
.\}
.nf
[i18n]
        commitEncoding = ISO\-8859\-1
.fi
.if n \{\
.RE
.\}
.sp
Commit objects created with the above setting record the value of
\fBi18n\&.commitEncoding\fR
in their
\fBencoding\fR
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\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04' 2.\h'+01'\c
.\}
.el \{\
.sp -1
.IP "  2." 4.2
.\}
\fIgit log\fR,
\fIgit show\fR,
\fIgit blame\fR
and friends look at the
\fBencoding\fR
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
\fBi18n\&.logOutputEncoding\fR
in \&.\fBgit/config\fR
file, like this:
.sp
.if n \{\
.RS 4
.\}
.nf
[i18n]
        logOutputEncoding = ISO\-8859\-1
.fi
.if n \{\
.RE
.\}
.sp
If you do not have this configuration variable, the value of
\fBi18n\&.commitEncoding\fR
is used instead\&.
.RE
.sp
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\&.
.SH "ENVIRONMENT AND CONFIGURATION VARIABLES"
.sp
The editor used to edit the commit log message will be chosen from the \fBGIT_EDITOR\fR environment variable, the core\&.editor configuration variable, the \fBVISUAL\fR environment variable, or the \fBEDITOR\fR environment variable (in that order)\&. See \fBgit-var\fR(1) for details\&.
.sp
Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there:
.PP
commit\&.cleanup
.RS 4
This setting overrides the default of the
\fB\-\-cleanup\fR
option in
\fBgit\fR
\fBcommit\fR\&. See
\fBgit-commit\fR(1)
for details\&. Changing the default can be useful when you always want to keep lines that begin with the comment character # in your log message, in which case you would do
\fBgit\fR
\fBconfig\fR
\fBcommit\&.cleanup\fR
\fBwhitespace\fR
(note that you will have to remove the help lines that begin with # in the commit log template yourself, if you do this)\&.
.RE
.PP
commit\&.gpgSign
.RS 4
A boolean to specify whether all commits should be GPG signed\&. Use of this option when doing operations such as rebase can result in a large number of commits being signed\&. It may be convenient to use an agent to avoid typing your GPG passphrase several times\&.
.RE
.PP
commit\&.status
.RS 4
A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit message\&. Defaults to true\&.
.RE
.PP
commit\&.template
.RS 4
Specify the pathname of a file to use as the template for new commit messages\&.
.RE
.PP
commit\&.verbose
.RS 4
A boolean or int to specify the level of verbosity with
\fBgit\fR
\fBcommit\fR\&. See
\fBgit-commit\fR(1)\&.
.RE
.SH "HOOKS"
.sp
This command can run \fBcommit\-msg\fR, \fBprepare\-commit\-msg\fR, \fBpre\-commit\fR, \fBpost\-commit\fR and \fBpost\-rewrite\fR hooks\&. See \fBgithooks\fR(5) for more information\&.
.SH "FILES"
.PP
\fB$GIT_DIR/COMMIT_EDITMSG\fR
.RS 4
This file contains the commit message of a commit in progress\&. If
\fBgit\fR
\fBcommit\fR
exits due to an error before creating a commit, any commit message that has been provided by the user (e\&.g\&., in an editor session) will be available in this file, but will be overwritten by the next invocation of
\fBgit\fR
\fBcommit\fR\&.
.RE
.SH "SEE ALSO"
.sp
\fBgit-add\fR(1), \fBgit-rm\fR(1), \fBgit-mv\fR(1), \fBgit-merge\fR(1), \fBgit-commit-tree\fR(1)
.SH "GIT"
.sp
Part of the \fBgit\fR(1) suite