.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-AM" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual"
+.TH "GIT\-AM" "1" "04/17/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
<mbox>\&...
The list of mailbox files to read patches from. If you do not supply this argument, reads from the standard input.
.TP
-\-\-signoff
+\-s, \-\-signoff
Add Signed\-off\-by: line to the commit message, using the committer identity of yourself.
.TP
-\-\-dotest=<dir>
+\-d=<dir>, \-\-dotest=<dir>
Instead of .dotest directory, use <dir> as a working area to store extracted patches.
.TP
-\-\-keep
+\-k, \-\-keep
Pass \-k flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)).
.TP
-\-\-utf8
+\-u, \-\-utf8
Pass \-u flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)). The proposed commit log message taken from the e\-mail are re\-coded into UTF\-8 encoding (configuration variable i18n.commitencoding can be used to specify project's preferred encoding if it is not UTF\-8).
This was optional in prior versions of git, but now it is the default. You could use \-\-no\-utf8 to override this.
.TP
\-\-no\-utf8
-Do not pass \-u flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)).
+Pass \-n flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)).
.TP
-\-\-binary
+\-b, \-\-binary
Pass \-\-allow\-binary\-replacement flag to git\-apply (see \fBgit\-apply\fR(1)).
.TP
-\-\-3way
+\-3, \-\-3way
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 locally.
.TP
\-\-skip
\-C<n>, \-p<n>
These flags are passed to the git\-apply program that applies the patch.
.TP
-\-\-interactive
+\-i, \-\-interactive
Run interactively, just like git\-applymbox.
.TP
-\-\-resolved
+\-r, \-\-resolved
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.
+.TP
+\-\-resolvemsg=<msg>
+When a patch failure occurs, <msg> will be printed to the screen before exiting. This overrides the standard message informing you to use \-\-resolved or \-\-skip to handle the failure. This is solely for internal use between git\-rebase and git\-am.
.SH "DISCUSSION"
The commit author name is taken from the "From: " line of the message, and commit author time 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>]". It is supposed to describe what the commit is about concisely as a one line text.
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-ANNOTATE" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual"
+.TH "GIT\-ANNOTATE" "1" "04/17/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Annotates each line in the given file with information from the commit which introduced the line. Optionally annotate from a given revision.
.SH "OPTIONS"
.TP
-\-l, \-\-long
-Show long rev (Defaults off).
+\-b
+Show blank SHA\-1 for boundary commits. This can also be controlled via the blame.blankboundary config option.
.TP
-\-t, \-\-time
-Show raw timestamp (Defaults off).
+\-\-root
+Do not treat root commits as boundaries. This can also be controlled via the blame.showroot config option.
.TP
-\-r, \-\-rename
-Follow renames (Defaults on).
+\-\-show\-stats
+Include additional statistics at the end of blame output.
.TP
-\-S, \-\-rev\-file <revs\-file>
-Use revs from revs\-file instead of calling git\-rev\-list.
+\-L n,m
+Annotate only the specified line range (lines count from 1).
+.TP
+\-l
+Show long rev (Default: off).
+.TP
+\-t
+Show raw timestamp (Default: off).
+.TP
+\-S <revs\-file>
+Use revs from revs\-file instead of calling \fBgit\-rev\-list\fR(1).
+.TP
+\-p, \-\-porcelain
+Show in a format designed for machine consumption.
+.TP
+\-\-incremental
+Show the result incrementally in a format designed for machine consumption.
+.TP
+\-\-contents <file>
+When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of he named file (specify \- to make the command read from the standard input).
+.TP
+\-M|<num>|
+Detect moving lines in the file as well. When a commit moves a block of lines in a file (e.g. the original file has A and then B, and the commit changes it to B and then A), traditional \fIblame\fR algorithm typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent.
+.sp
+.nf
+<num> is optional but it is the lower bound on the number of
+alphanumeric characters that git must detect as moving
+within a file for it to associate those lines with the parent
+commit.
+.fi
+.TP
+\-C|<num>|
+In addition to \-M, detect lines copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command looks for copies from all other files in the parent for the commit that creates the file in addition.
+.sp
+.nf
+<num> is optional but it is the lower bound on the number of
+alphanumeric characters that git must detect as moving
+between files for it to associate those lines with the parent
+commit.
+.fi
.TP
\-h, \-\-help
Show help message.
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-APPLY" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual"
+.TH "GIT\-APPLY" "1" "04/17/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "SYNOPSIS"
.sp
.nf
-\fIgit\-apply\fR [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index] [\-\-apply]
- [\-\-no\-add] [\-\-index\-info] [\-\-allow\-binary\-replacement | \-\-binary]
- [\-R | \-\-reverse] [\-\-reject] [\-z] [\-pNUM] [\-CNUM] [\-\-inaccurate\-eof]
- [\-\-whitespace=<nowarn|warn|error|error\-all|strip>] [\-\-exclude=PATH]
- [\-\-cached] [\-\-verbose] [<patch>\&...]
+\fIgit\-apply\fR [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index]
+ [\-\-apply] [\-\-no\-add] [\-\-index\-info] [\-R | \-\-reverse]
+ [\-\-allow\-binary\-replacement | \-\-binary] [\-\-reject] [\-z]
+ [\-pNUM] [\-CNUM] [\-\-inaccurate\-eof] [\-\-cached]
+ [\-\-whitespace=<nowarn|warn|error|error\-all|strip>]
+ [\-\-exclude=PATH] [\-\-verbose] [<patch>\&...]
.fi
.SH "DESCRIPTION"
Reads supplied diff output and applies it on a git index file and a work tree.
\-\-inaccurate\-eof
Under certain circumstances, some versions of diff do not correctly detect a missing new\-line at the end of the file. As a result, patches created by such diff programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug.
.TP
-\-\-verbose
+\-v, \-\-verbose
Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported.
.SH "CONFIGURATION"
.TP
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-APPLYMBOX" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual"
+.TH "GIT\-APPLYMBOX" "1" "04/17/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Patches are applied with git\-apply command, and unless it cleanly applies without fuzz, the processing fails. With this flag, if a tree that the patch applies cleanly is found in a repository, the patch is applied to the tree and then a 3\-way merge between the resulting tree and the current tree.
.TP
\-u
-The commit log message, author name and author email are taken from the e\-mail, and after minimally decoding MIME transfer encoding, re\-coded in UTF\-8 by transliterating them. This used to be optional but now it is the default.
+Pass \-u flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)). The proposed commit log message taken from the e\-mail are re\-coded into UTF\-8 encoding (configuration variable i18n.commitencoding can be used to specify project's preferred encoding if it is not UTF\-8). This used to be optional but now it is the default.
Note that the patch is always used as\-is without charset conversion, even with this flag.
.TP
+\-n
+Pass \-n flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)).
+.TP
\-c .dotest/<num>
When the patch contained in an e\-mail does not cleanly apply, the command exits with an error message. The patch and extracted message are found in .dotest/, and you could re\-run \fIgit applymbox\fR with \fI\-c .dotest/<num>\fR flag to restart the process after inspecting and fixing them.
.TP
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-BLAME" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual"
+.TH "GIT\-BLAME" "1" "04/17/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "SYNOPSIS"
.sp
.nf
-\fIgit\-blame\fR [\-c] [\-l] [\-t] [\-f] [\-n] [\-p] [\-\-incremental] [\-L n,m] [\-S <revs\-file>]
- [\-M] [\-C] [\-C] [\-\-since=<date>] [<rev> | \-\-contents <file>] [\-\-] <file>
+\fIgit\-blame\fR [\-c] [\-l] [\-t] [\-f] [\-n] [\-p] [\-\-incremental] [\-L n,m]
+ [\-S <revs\-file>] [\-M] [\-C] [\-C] [\-\-since=<date>]
+ [<rev> | \-\-contents <file>] [\-\-] <file>
.fi
.SH "DESCRIPTION"
Annotates each line in the given file with information from the revision which last modified the line. Optionally, start annotating from the given revision.
.fi
.SH "OPTIONS"
.TP
-\-c, \-\-compatibility
-Use the same output mode as \fBgit\-annotate\fR(1) (Default: off).
+\-b
+Show blank SHA\-1 for boundary commits. This can also be controlled via the blame.blankboundary config option.
+.TP
+\-\-root
+Do not treat root commits as boundaries. This can also be controlled via the blame.showroot config option.
+.TP
+\-\-show\-stats
+Include additional statistics at the end of blame output.
.TP
\-L n,m
Annotate only the specified line range (lines count from 1).
.TP
-\-l, \-\-long
+\-l
Show long rev (Default: off).
.TP
-\-t, \-\-time
+\-t
Show raw timestamp (Default: off).
.TP
-\-S, \-\-rev\-file <revs\-file>
+\-S <revs\-file>
Use revs from revs\-file instead of calling \fBgit\-rev\-list\fR(1).
.TP
-\-f, \-\-show\-name
-Show filename in the original commit. By default filename is shown if there is any line that came from a file with different name, due to rename detection.
-.TP
-\-n, \-\-show\-number
-Show line number in the original commit (Default: off).
-.TP
\-p, \-\-porcelain
Show in a format designed for machine consumption.
.TP
\-\-contents <file>
When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of he named file (specify \- to make the command read from the standard input).
.TP
-\-M
+\-M|<num>|
Detect moving lines in the file as well. When a commit moves a block of lines in a file (e.g. the original file has A and then B, and the commit changes it to B and then A), traditional \fIblame\fR algorithm typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent.
+.sp
+.nf
+<num> is optional but it is the lower bound on the number of
+alphanumeric characters that git must detect as moving
+within a file for it to associate those lines with the parent
+commit.
+.fi
.TP
-\-C
+\-C|<num>|
In addition to \-M, detect lines copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command looks for copies from all other files in the parent for the commit that creates the file in addition.
+.sp
+.nf
+<num> is optional but it is the lower bound on the number of
+alphanumeric characters that git must detect as moving
+between files for it to associate those lines with the parent
+commit.
+.fi
.TP
\-h, \-\-help
Show help message.
+.TP
+\-c
+Use the same output mode as \fBgit\-annotate\fR(1) (Default: off).
+.TP
+\-\-score\-debug
+Include debugging information related to the movement of lines between files (see \-C) and lines moved within a file (see \-M). The first number listed is the score. This is the number of alphanumeric characters detected to be moved between or within files. This must be above a certain threshold for git\-blame to consider those lines of code to have been moved.
+.TP
+\-f, \-\-show\-name
+Show filename in the original commit. By default filename is shown if there is any line that came from a file with different name, due to rename detection.
+.TP
+\-n, \-\-show\-number
+Show line number in the original commit (Default: off).
.SH "THE PORCELAIN FORMAT"
In this format, each line is output after a header; the header at the minimum has the first line which has:
.TP 3
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHECKOUT" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual"
+.TH "GIT\-CHECKOUT" "1" "04/17/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "DESCRIPTION"
When <paths> are not given, this command switches branches by updating the index and working tree to reflect the specified branch, <branch>, and updating HEAD to be <branch> or, if specified, <new_branch>. Using \-b will cause <new_branch> to be created; in this case you can use the \-\-track or \-\-no\-track options, which will be passed to git branch.
-When <paths> are given, this command does \fBnot\fR switch branches. It updates the named paths in the working tree from the index file (i.e. it runs git\-checkout\-index \-f \-u), or a named commit. In this case, \-f and \-b options are meaningless and giving either of them results in an error. <tree\-ish> argument can be used to specify a specific tree\-ish (i.e. commit, tag or tree) to update the index for the given paths before updating the working tree.
+When <paths> are given, this command does \fBnot\fR switch branches. It updates the named paths in the working tree from the index file (i.e. it runs git\-checkout\-index \-f \-u), or from a named commit. In this case, the \-f and \-b options are meaningless and giving either of them results in an error. <tree\-ish> argument can be used to specify a specific tree\-ish (i.e. commit, tag or tree) to update the index for the given paths before updating the working tree.
.SH "OPTIONS"
.TP
\-q
Quiet, supress feedback messages.
.TP
\-f
-Force a re\-read of everything.
+Proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes.
.TP
\-b
Create a new branch named <new_branch> and start it at <branch>. The new branch name must pass all checks defined by \fBgit\-check\-ref\-format\fR(1). Some of these checks may restrict the characters allowed in a branch name.
.TP
\-\-track
-When \-b is given and a branch is created off a remote branch, setup so that git\-pull will automatically retrieve data from the remote branch.
+When \-b is given and a branch is created off a remote branch, set up configuration so that git\-pull will automatically retrieve data from the remote branch. Set the branch.autosetupmerge configuration variable to true if you want git\-checkout and git\-branch to always behave as if \fI\-\-track\fR were given.
.TP
\-\-no\-track
-When \-b is given and a branch is created off a remote branch, force that git\-pull will automatically retrieve data from the remote branch independent of the configuration settings.
+When \-b is given and a branch is created off a remote branch, set up configuration so that git\-pull will not retrieve data from the remote branch, ignoring the branch.autosetupmerge configuration variable.
.TP
\-l
Create the new branch's ref log. This activates recording of all changes to made the branch ref, enabling use of date
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-LOST\-FOUND" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual"
+.TH "GIT\-LOST\-FOUND" "1" "04/17/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "SYNOPSIS"
\fIgit\-lost\-found\fR
.SH "DESCRIPTION"
-Finds dangling commits and tags from the object database, and creates refs to them in .git/lost\-found/ directory. Commits and tags that dereference to commits go to .git/lost\-found/commit and others are stored in .git/lost\-found/other directory.
+Finds dangling commits and tags from the object database, and creates refs to them in the .git/lost\-found/ directory. Commits and tags that dereference to commits are stored in .git/lost\-found/commit, and other objects are stored in .git/lost\-found/other.
.SH "OUTPUT"
-One line description from the commit and tag found along with their object name are printed on the standard output.
+Prints to standard output the object names and one\-line descriptions of any commits or tags found.
.SH "EXAMPLE"
-Suppose you run \fIgit tag \-f\fR and mistyped the tag to overwrite. The ref to your tag is overwritten, but until you run \fIgit prune\fR, it is still there.
+Suppose you run \fIgit tag \-f\fR and mistype the tag to overwrite. The ref to your tag is overwritten, but until you run \fIgit prune\fR, the tag itself is still there.
.sp
.nf
$ git lost\-found
[1ef2b196d909eed523d4f3c9bf54b78cdd6843c6] GIT 0.99.9c
...
.fi
-Also you can use gitk to browse how they relate to each other and existing (probably old) tags.
+Also you can use gitk to browse how any tags found relate to each other.
.sp
.nf
$ gitk $(cd .git/lost\-found/commit && echo ??*)
.fi
-After making sure that it is the object you are looking for, you can reconnect it to your regular .git/refs hierarchy.
+After making sure you know which the object is the tag you are looking for, you can reconnect it to your regular .git/refs hierarchy.
.sp
.nf
$ git cat\-file \-t 1ef2b196
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RM" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual"
+.TH "GIT\-RM" "1" "04/17/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.TP
\-\-cached
This option can be used to tell the command to remove the paths only from the index, leaving working tree files.
+.TP
+\-\-quiet
+git\-rm normally outputs one line (in the form of an "rm" command) for each file removed. This option suppresses that output.
.SH "DISCUSSION"
The list of <file> given to the command can be exact pathnames, file glob patterns, or leading directory name. The command removes only the paths that is known to git. Giving the name of a file that you have not told git about does not remove that file.
.SH "EXAMPLES"
projects / git.git / commitdiff