.\" 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\-ADD" "1" "05/18/2007" "Git 1.5.2.rc3.61.g4229" "Git Manual"
+.TH "GIT\-ADD" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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" "05/25/2007" "Git 1.5.2.73.g18bece" "Git Manual"
+.TH "GIT\-AM" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
[\-\-3way] [\-\-interactive] [\-\-binary]
[\-\-whitespace=<option>] [\-C<n>] [\-p<n>]
<mbox>|<Maildir>\&...
-.fi
\fIgit\-am\fR [\-\-skip | \-\-resolved]
+.fi
.SH "DESCRIPTION"
Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch.
.SH "OPTIONS"
.\" 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/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-ANNOTATE" "1" "06/02/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-APPLY" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-APPLYMBOX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-APPLYPATCH" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-APPLYPATCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-ARCHIMPORT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-ARCHIMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-ARCHIVE" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-ARCHIVE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-BISECT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-BISECT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
+.TH "GIT\-BLAME" "1" "06/02/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-BRANCH" "1" "05/16/2007" "Git 1.5.2.rc3.50.gfdcb7" "Git Manual"
+.TH "GIT\-BRANCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-BUNDLE" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-BUNDLE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CAT\-FILE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CAT\-FILE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CHECK\-ATTR" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHECK\-ATTR" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CHECK\-REF\-FORMAT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHECK\-REF\-FORMAT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-INDEX" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHECKOUT\-INDEX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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/24/2007" "Git 1.5.2.rc0.14.g520d" "Git Manual"
+.TH "GIT\-CHECKOUT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CHERRY\-PICK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHERRY\-PICK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CHERRY" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CHERRY" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CLEAN" "1" "05/08/2007" "Git 1.5.2.rc2.21.g3082" "Git Manual"
+.TH "GIT\-CLEAN" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CLONE" "1" "05/12/2007" "Git 1.5.2.rc3.14.g6671" "Git Manual"
+.TH "GIT\-CLONE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-COMMIT\-TREE" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
+.TH "GIT\-COMMIT\-TREE" "1" "06/02/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-COMMIT" "1" "04/22/2007" "" ""
+.TH "GIT\-COMMIT" "1" "06/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CONFIG" "1" "05/31/2007" "Git 1.5.2.146.gb75c6" "Git Manual"
+.TH "GIT\-CONFIG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Common unit suffixes of \fIk\fR, \fIm\fR, or \fIg\fR are supported.
.TP
core.excludeFile
-In addition to \fI.gitignore\fR (per\-directory) and \fI.git/info/exclude\fR, git looks into this file for patterns of files which are not meant to be tracked.
+In addition to \fI.gitignore\fR (per\-directory) and \fI.git/info/exclude\fR, git looks into this file for patterns of files which are not meant to be tracked. See \fBgitignore\fR(5).
.TP
alias.*
Command aliases for the \fBgit\fR(1) command wrapper \- e.g. after defining "alias.last = cat\-file commit HEAD", the invocation "git last" is equivalent to "git cat\-file commit HEAD". To avoid confusion and troubles with script usage, aliases that hide existing git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. quote pair and a backslash can be used to quote them.
pack.compression
An integer \-1..9, indicating the compression level for objects in a pack file. \-1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to \-1.
.TP
+pack.deltaCacheSize
+The maxium memory in bytes used for caching deltas in \fBgit\-pack\-objects\fR(1). A value of 0 means no limit. Defaults to 0.
+.TP
+pack.deltaCacheLimit
+The maxium size of a delta, that is cached in \fBgit\-pack\-objects\fR(1). Defaults to 1000.
+.TP
pull.octopus
The default merge strategy to use when pulling multiple branches at once.
.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\-CONVERT\-OBJECTS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CONVERT\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-COUNT\-OBJECTS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-COUNT\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CVSEXPORTCOMMIT" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-CVSEXPORTCOMMIT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CVSIMPORT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-CVSIMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-CVSSERVER" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-CVSSERVER" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-DAEMON" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-DAEMON" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-DESCRIBE" "1" "05/22/2007" "Git 1.5.2.35.ga334" "Git Manual"
+.TH "GIT\-DESCRIBE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-DIFF\-FILES" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
+.TH "GIT\-DIFF\-FILES" "1" "06/02/2007" "Git 1.5.2.rc2" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-DIFF\-INDEX" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
+.TH "GIT\-DIFF\-INDEX" "1" "06/02/2007" "Git 1.5.2.rc2" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-DIFF\-TREE" "1" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-DIFF\-TREE" "1" "06/02/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-DIFF" "1" "04/22/2007" "" ""
+.TH "GIT\-DIFF" "1" "06/02/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-FAST\-IMPORT" "1" "05/10/2007" "Git 1.5.2.rc3" "Git Manual"
+.TH "GIT\-FAST\-IMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-FETCH\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-FETCH\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-FETCH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-FETCH" "1" "06/02/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-FMT\-MERGE\-MSG" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-FMT\-MERGE\-MSG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-FOR\-EACH\-REF" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-FOR\-EACH\-REF" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-FORMAT\-PATCH" "1" "04/22/2007" "Git 1.5.1.1.81.g6aea" "Git Manual"
+.TH "GIT\-FORMAT\-PATCH" "1" "06/02/2007" "Git 1.5.1.1.81.g6aea" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-FSCK\-OBJECTS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-FSCK\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-FSCK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-FSCK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-GC" "1" "05/20/2007" "Git 1.5.2.14.g45bde" "Git Manual"
+.TH "GIT\-GC" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Usually git\-gc packs refs, expires old reflog entries, packs loose objects, and removes old \fIrerere\fR records. Removal of unreferenced loose objects is an unsafe operation while other git operations are in progress, so it is not done by default. Pass this option if you want it, and only when you know nobody else is creating new objects in the repository at the same time (e.g. never use this option in a cron script).
.TP
\-\-aggressive
-Usually \fIgit\-gc\fR runs very quickly while providing good disk space utilization and performance. This option will cause git\-gc to more aggressive optimize the repository at the expense of taking much more time. The effects of this optimization are persistent, so this option only needs to be sporadically; every few hundred changesets or so.
+Usually \fIgit\-gc\fR runs very quickly while providing good disk space utilization and performance. This option will cause git\-gc to more aggressively optimize the repository at the expense of taking much more time. The effects of this optimization are persistent, so this option only needs to be used occasionally; every few hundred changesets or so.
.SH "CONFIGURATION"
The optional configuration variable \fIgc.reflogExpire\fR can be set to indicate how long historical entries within each branch's reflog should remain available in this repository. The setting is expressed as a length of time, for example \fI90 days\fR or \fI3 months\fR. It defaults to \fI90 days\fR.
.\" 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\-GET\-TAR\-COMMIT\-I" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-GET\-TAR\-COMMIT\-I" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-GREP" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-GREP" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-HASH\-OBJECT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-HASH\-OBJECT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-HTTP\-FETCH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-HTTP\-FETCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-HTTP\-PUSH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
+.TH "GIT\-HTTP\-PUSH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-IMAP\-SEND" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-IMAP\-SEND" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-INDEX\-PACK" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-INDEX\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-INIT\-DB" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-INIT\-DB" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-INIT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-INIT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-INSTAWEB" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-INSTAWEB" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-LOCAL\-FETCH" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-LOCAL\-FETCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-LOG" "1" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-LOG" "1" "06/02/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-LOST\-FOUND" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-LS\-FILES" "1" "05/27/2007" "Git 1.5.2.86.g99b5" "Git Manual"
+.TH "GIT\-LS\-FILES" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively.
.SH "EXCLUDE PATTERNS"
-\fIgit\-ls\-files\fR can use a list of "exclude patterns" when traversing the directory tree and finding files to show when the flags \-\-others or \-\-ignored are specified.
+\fIgit\-ls\-files\fR can use a list of "exclude patterns" when traversing the directory tree and finding files to show when the flags \-\-others or \-\-ignored are specified. \fBgitignore\fR(5) specifies the format of exclude patterns.
-These exclude patterns come from these places:
+These exclude patterns come from these places, in order:
.TP 3
1.
-command line flag \-\-exclude=<pattern> specifies a single pattern.
+The command line flag \-\-exclude=<pattern> specifies a single pattern. Patterns are ordered in the same order they appear in the command line.
.TP
2.
-command line flag \-\-exclude\-from=<file> specifies a list of patterns stored in a file.
+The command line flag \-\-exclude\-from=<file> specifies a file containing a list of patterns. Patterns are ordered in the same order they appear in the file.
.TP
3.
-command line flag \-\-exclude\-per\-directory=<name> specifies a name of the file in each directory \fIgit\-ls\-files\fR examines, and if exists, its contents are used as an additional list of patterns.
-
-An exclude pattern file used by (2) and (3) contains one pattern per line. A line that starts with a \fI#\fR can be used as comment for readability.
-
-There are three lists of patterns that are in effect at a given time. They are built and ordered in the following way:
-.TP 3
-\(bu
-\-\-exclude=<pattern> from the command line; patterns are ordered in the same order as they appear on the command line.
-.TP
-\(bu
-lines read from \-\-exclude\-from=<file>; patterns are ordered in the same order as they appear in the file.
-.TP
-\(bu
-When \-\-exclude\-per\-directory=<name> is specified, upon entering a directory that has such a file, its contents are appended at the end of the current "list of patterns". They are popped off when leaving the directory.
-
-Each pattern in the pattern list specifies "a match pattern" and optionally the fate; either a file that matches the pattern is considered excluded or included. A filename is matched against the patterns in the three lists; the \-\-exclude\-from list is checked first, then the \-\-exclude\-per\-directory list, and then finally the \-\-exclude list. The last match determines its fate. If there is no match in the three lists, the fate is "included".
+command line flag \-\-exclude\-per\-directory=<name> specifies a name of the file in each directory \fIgit\-ls\-files\fR examines, normally .gitignore. Files in deeper directories take precedence. Patterns are ordered in the same order they appear in the files.
A pattern specified on the command line with \-\-exclude or read from the file specified with \-\-exclude\-from is relative to the top of the directory tree. A pattern read from a file specified by \-\-exclude\-per\-directory is relative to the directory that the pattern file appears in.
-
-An exclude pattern is of the following format:
-.TP 3
-\(bu
-an optional prefix \fI!\fR which means that the fate this pattern specifies is "include", not the usual "exclude"; the remainder of the pattern string is interpreted according to the following rules.
-.TP
-\(bu
-if it does not contain a slash \fI/\fR, it is a shell glob pattern and used to match against the filename without leading directories.
-.TP
-\(bu
-otherwise, it is a shell glob pattern, suitable for consumption by fnmatch(3) with FNM_PATHNAME flag. I.e. a slash in the pattern must match a slash in the pathname. "Documentation/*.html" matches "Documentation/git.html" but not "ppc/ppc.html". As a natural exception, "/*.c" matches "cat\-file.c" but not "mozilla\-sha1/sha1.c".
-
-An example:
-.sp
-.nf
- $ cat .git/info/exclude
- # ignore objects and archives, anywhere in the tree.
- *.[oa]
- $ cat Documentation/.gitignore
- # ignore generated html files,
- *.html
- # except foo.html which is maintained by hand
- !foo.html
- $ git\-ls\-files \-\-ignored \\
- \-\-exclude='Documentation/*.[0\-9]' \\
- \-\-exclude\-from=.git/info/exclude \\
- \-\-exclude\-per\-directory=.gitignore
-.fi
-Another example:
-.sp
-.nf
- $ cat .gitignore
- vmlinux*
- $ ls arch/foo/kernel/vm*
- arch/foo/kernel/vmlinux.lds.S
- $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore
-.fi
-The second .gitignore keeps arch/foo/kernel/vmlinux.lds.S file from getting ignored.
.SH "SEE ALSO"
-\fBgit\-read\-tree\fR(1)
+\fBgit\-read\-tree\fR(1), \fBgitignore\fR(5)
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org>
.SH "DOCUMENTATION"
-Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger.kernel.org>.
+Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git\-list <git@vger.kernel.org>.
.SH "GIT"
Part of the \fBgit\fR(7) suite
.\" 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\-LS\-REMOTE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-LS\-REMOTE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-LS\-TREE" "1" "05/23/2007" "Git 1.5.2.45.ged82" "Git Manual"
+.TH "GIT\-LS\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MAILINFO" "1" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-MAILINFO" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MAILSPLIT" "1" "05/25/2007" "Git 1.5.2.73.g18bece" "Git Manual"
+.TH "GIT\-MAILSPLIT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MERGE\-BASE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-BASE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MERGE\-FILE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-FILE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MERGE\-INDEX" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-INDEX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MERGE\-ONE\-FILE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-ONE\-FILE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MERGE\-TREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MERGE\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MERGE" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-MERGE" "1" "06/02/2007" "Git 1.5.2.136.g322bc" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MERGETOOL" "1" "05/04/2007" "Git 1.5.2.rc1.20.g86b9" "Git Manual"
+.TH "GIT\-MERGETOOL" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MKTAG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MKTAG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MKTREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MKTREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-MV" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-MV" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-NAME\-REV" "1" "05/22/2007" "Git 1.5.2.35.ga334" "Git Manual"
+.TH "GIT\-NAME\-REV" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-P4IMPORT" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-P4IMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PACK\-OBJECTS" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-PACK\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PACK\-REDUNDANT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PACK\-REDUNDANT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PACK\-REFS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PACK\-REFS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PARSE\-REMOTE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PARSE\-REMOTE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PATCH\-ID" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PATCH\-ID" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PEEK\-REMOTE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PEEK\-REMOTE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PRUNE\-PACKED" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PRUNE\-PACKED" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PRUNE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-PRUNE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PULL" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-PULL" "1" "06/02/2007" "Git 1.5.2.136.g322bc" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-PUSH" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-PUSH" "1" "06/02/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-QUILTIMPORT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-QUILTIMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-READ\-TREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-READ\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
In other words, there is no need to worry about what exists only in the working tree. When you have local changes in a part of the project that is not involved in the merge, your changes do not interfere with the merge, and are kept intact. When they \fBdo\fR interfere, the merge does not even start (git\-read\-tree complains loudly and fails without modifying anything). In such a case, you can simply continue doing what you were in the middle of doing, and when your working tree is ready (i.e. you have finished your work\-in\-progress), attempt the merge again.
.SH "SEE ALSO"
-\fBgit\-write\-tree\fR(1); \fBgit\-ls\-files\fR(1)
+\fBgit\-write\-tree\fR(1); \fBgit\-ls\-files\fR(1); \fBgitignore\fR(5)
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org>
.SH "DOCUMENTATION"
.\" 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\-REBASE" "1" "05/19/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
+.TH "GIT\-REBASE" "1" "06/02/2007" "Git 1.5.2.rc3.87.g404f" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-RECEIVE\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RECEIVE\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-REFLOG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-REFLOG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-RELINK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RELINK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-REMOTE" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
+.TH "GIT\-REMOTE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-REPACK" "1" "05/29/2007" "Git 1.5.2.136.g322bc" "Git Manual"
+.TH "GIT\-REPACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-REPO\-CONFIG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-REPO\-CONFIG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-REQUEST\-PULL" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-REQUEST\-PULL" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-RERERE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RERERE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-RESET" "1" "04/24/2007" "Git 1.5.2.rc0.14.g520d" "Git Manual"
+.TH "GIT\-RESET" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-REV\-LIST" "1" "05/21/2007" "Git 1.5.2.24.g93d4" "Git Manual"
+.TH "GIT\-REV\-LIST" "1" "06/02/2007" "Git 1.5.2.24.g93d4" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-REV\-PARSE" "1" "05/10/2007" "Git 1.5.2.rc3" "Git Manual"
+.TH "GIT\-REV\-PARSE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-REVERT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-REVERT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RM" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-RUNSTATUS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-RUNSTATUS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SEND\-EMAIL" "1" "05/01/2007" "Git 1.5.2.rc1" "Git Manual"
+.TH "GIT\-SEND\-EMAIL" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SEND\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SEND\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SH\-SETUP" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SH\-SETUP" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SHELL" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SHELL" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SHORTLOG" "1" "04/29/2007" "Git 1.5.2.rc0.95.ga0715" "Git Manual"
+.TH "GIT\-SHORTLOG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SHOW\-BRANCH" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SHOW\-BRANCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SHOW\-INDEX" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SHOW\-INDEX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SHOW\-REF" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SHOW\-REF" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SHOW" "1" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GIT\-SHOW" "1" "06/02/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SSH\-FETCH" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SSH\-FETCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SSH\-UPLOAD" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SSH\-UPLOAD" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-STATUS" "1" "05/22/2007" "Git 1.5.2.35.ga334" "Git Manual"
+.TH "GIT\-STATUS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
The output from this command is designed to be used as a commit template comments, and all the output lines are prefixed with \fI#\fR.
.SH "CONFIGURATION"
The command honors color.status (or status.color \(em they mean the same thing and the latter is kept for backward compatibility) and color.status.<slot> configuration variables to colorize its output.
-
-As for \fBgit\-add\fR(1), the configuration variable \fIcore.excludesfile\fR can indicate a path to a file containing patterns of file names to exclude, in addition to patterns given in \fIinfo/exclude\fR and \fI.gitignore\fR.
+.SH "SEE ALSO"
+\fBgitignore\fR(5)
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>.
.SH "DOCUMENTATION"
.\" 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\-STRIPSPACE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-STRIPSPACE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SVN" "1" "05/06/2007" "Git 1.5.2.rc2" "Git Manual"
+.TH "GIT\-SVN" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SVNIMPORT" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SVNIMPORT" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-SYMBOLIC\-REF" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-SYMBOLIC\-REF" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-TAG" "1" "05/04/2007" "Git 1.5.2.rc1.20.g86b9" "Git Manual"
+.TH "GIT\-TAG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-TAR\-TREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-TAR\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-UNPACK\-FILE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UNPACK\-FILE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-UNPACK\-OBJECTS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UNPACK\-OBJECTS" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-UPDATE\-INDEX" "1" "05/08/2007" "Git 1.5.2.rc2.21.g3082" "Git Manual"
+.TH "GIT\-UPDATE\-INDEX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-UPDATE\-REF" "1" "05/20/2007" "Git 1.5.2.14.g45bde" "Git Manual"
+.TH "GIT\-UPDATE\-REF" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-UPDATE\-SERVER\-IN" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UPDATE\-SERVER\-IN" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-UPLOAD\-ARCHIVE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UPLOAD\-ARCHIVE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-UPLOAD\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-UPLOAD\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-VAR" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-VAR" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-VERIFY\-PACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-VERIFY\-PACK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-VERIFY\-TAG" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-VERIFY\-TAG" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-WHATCHANGED" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-WHATCHANGED" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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\-WRITE\-TREE" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-WRITE\-TREE" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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 "GITK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GITK" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.\" 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 "GITATTRIBUTES" "5" "05/15/2007" "Git 1.5.2.rc3.39.gaf9b" "Git Manual"
+.TH "GITATTRIBUTES" "5" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
--- /dev/null
+.\" ** You probably do not want to edit this file directly **
+.\" 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 "GITIGNORE" "5" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+gitignore \- Specifies intentionally untracked files to ignore
+.SH "SYNOPSIS"
+$GIT_DIR/info/exclude, .gitignore
+.SH "DESCRIPTION"
+A gitignore file specifies intentionally untracked files that git should ignore. Each line in a gitignore file specifies a pattern.
+
+When deciding whether to ignore a path, git normally checks gitignore patterns from multiple sources, with the following order of precedence:
+.TP 3
+\(bu
+Patterns read from the file specified by the configuration variable \fIcore.excludesfile\fR.
+.TP
+\(bu
+Patterns read from $GIT_DIR/info/exclude.
+.TP
+\(bu
+Patterns read from a .gitignore file in the same directory as the path, or in any parent directory, ordered from the deepest such file to a file in the root of the repository. These patterns match relative to the location of the .gitignore file. A project normally includes such .gitignore files in its repository, containing patterns for files generated as part of the project build.
+
+The underlying git plumbing tools, such as \fBgit\-ls\-files\fR(1) and \fBgit\-read\-tree\fR(1), read gitignore patterns specified by command\-line options, or from files specified by command\-line options. Higher\-level git tools, such as \fBgit\-status\fR(1) and \fBgit\-add\fR(1), use patterns from the sources specified above.
+
+Patterns have the following format:
+.TP 3
+\(bu
+A blank line matches no files, so it can serve as a separator for readability.
+.TP
+\(bu
+A line starting with # serves as a comment.
+.TP
+\(bu
+An optional prefix \fI!\fR which negates the pattern; any matching file excluded by a previous pattern will become included again.
+.TP
+\(bu
+If the pattern does not contain a slash \fI/\fR, git treats it as a shell glob pattern and checks for a match against the pathname without leading directories.
+.TP
+\(bu
+Otherwise, git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, "Documentation/*.html" matches "Documentation/git.html" but not "Documentation/ppc/ppc.html". A leading slash matches the beginning of the pathname; for example, "/*.c" matches "cat\-file.c" but not "mozilla\-sha1/sha1.c".
+
+An example:
+.sp
+.nf
+ $ git\-status
+ [...]
+ # Untracked files:
+ [...]
+ # Documentation/foo.html
+ # Documentation/gitignore.html
+ # file.o
+ # lib.a
+ # src/internal.o
+ [...]
+ $ cat .git/info/exclude
+ # ignore objects and archives, anywhere in the tree.
+ *.[oa]
+ $ cat Documentation/.gitignore
+ # ignore generated html files,
+ *.html
+ # except foo.html which is maintained by hand
+ !foo.html
+ $ git\-status
+ [...]
+ # Untracked files:
+ [...]
+ # Documentation/foo.html
+ [...]
+.fi
+Another example:
+.sp
+.nf
+ $ cat .gitignore
+ vmlinux*
+ $ ls arch/foo/kernel/vm*
+ arch/foo/kernel/vmlinux.lds.S
+ $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore
+.fi
+The second .gitignore prevents git from ignoring arch/foo/kernel/vmlinux.lds.S.
+.SH "DOCUMENTATION"
+Documentation by David Greaves, Junio C Hamano, Josh Triplett, Frank Lichtenheld, and the git\-list <git@vger.kernel.org>.
+.SH "GIT"
+Part of the \fBgit\fR(7) suite
+
.\" 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" "7" "05/20/2007" "Git 1.5.2" "Git Manual"
+.TH "GIT" "7" "06/02/2007" "Git 1.5.2" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)