.\" 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" "08/18/2007" "Git 1.5.3.rc5.19.g0734d" "Git Manual"
+.TH "GIT\-COMMIT\-TREE" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\(bu
committer name and email and the commit time.
-While parent object ids are provided on the command line, author and commiter information is taken from the following environment variables, if set:
+While parent object ids are provided on the command line, author and committer information is taken from the following environment variables, if set:
.sp
.nf
GIT_AUTHOR_NAME
.\" 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" "08/23/2007" "Git 1.5.3.rc6.9.gaabb2" "Git Manual"
+.TH "GIT\-CONFIG" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\-z, \-\-null
For all options that output values and/or keys, always end values with with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks.
.SH "FILES"
-If not set explicitely with \fI\-\-file\fR, there are three files where git\-config will search for configuration options:
+If not set explicitly with \fI\-\-file\fR, there are three files where git\-config will search for configuration options:
Example\ 1.\ git/config::.sp
.nf
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
core.editor
-Commands such as commit and tag that lets you edit messages by lauching an editor uses the value of this variable when it is set, and the environment variable GIT_EDITOR is not set. The order of preference is GIT_EDITOR environment, core.editor, VISUAL and EDITOR environment variables and then finally vi.
+Commands such as commit and tag that lets you edit messages by launching an editor uses the value of this variable when it is set, and the environment variable GIT_EDITOR is not set. The order of preference is GIT_EDITOR environment, core.editor, VISUAL and EDITOR environment variables and then finally vi.
.TP
core.pager
The command that git will use to paginate output. Can be overridden with the GIT_PAGER environment variable.
Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. See \fBgit\-rerere\fR(1).
.TP
gitcvs.enabled
-Whether the cvs server interface is enabled for this repository. See \fBgit\-cvsserver\fR(1).
+Whether the CVS server interface is enabled for this repository. See \fBgit\-cvsserver\fR(1).
.TP
gitcvs.logfile
-Path to a log file where the cvs server interface well\&... logs various stuff. See \fBgit\-cvsserver\fR(1).
+Path to a log file where the CVS server interface well\&... logs various stuff. See \fBgit\-cvsserver\fR(1).
.TP
gitcvs.allbinary
If true, all files are sent to the client in mode \fI\-kb\fR. This causes the client to treat all files as binary files which suppresses any newline munging it otherwise might do. A work\-around for the fact that there is no way yet to set single files to mode \fI\-kb\fR.
gitcvs.dbuser, gitcvs.dbpass
Database user and password. Only useful if setting \fIgitcvs.dbdriver\fR, since SQLite has no concept of database users and/or passwords. \fIgitcvs.dbuser\fR supports variable substitution (see \fBgit\-cvsserver\fR(1) for details).
-All gitcvs variables except for \fIgitcvs.allbinary\fR can also
specifed as \fIgitcvs.<access_method>.<varname>\fR (where \fIaccess_method\fR is one of "ext" and "pserver") to make them apply only for the given access method.
+All gitcvs variables except for \fIgitcvs.allbinary\fR can also
be specified as \fIgitcvs.<access_method>.<varname>\fR (where \fIaccess_method\fR is one of "ext" and "pserver") to make them apply only for the given access method.
.TP
http.sslVerify
Whether to verify the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_NO_VERIFY\fR environment variable.
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.
+The maximum 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.
.\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-CVSEXPORTCOMMIT" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Prepend the commit message with the provided prefix. Useful for patch series and the like.
.TP
\-u
-Update affected files from cvs repository before attempting export.
+Update affected files from CVS repository before attempting export.
.TP
\-v
Verbose.
.\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-CVSSERVER" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.fi
No special setup is needed for SSH access, other than having GIT tools in the PATH. If you have clients that do not accept the CVS_SERVER environment variable, you can rename git\-cvsserver to cvs.
-Note: Newer cvs versions (>= 1.12.11) also support specifying CVS_SERVER directly in CVSROOT like
+Note: Newer CVS versions (>= 1.12.11) also support specifying CVS_SERVER directly in CVSROOT like
.sp
.nf
.ft C
.\" 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" "08/19/2007" "Git 1.5.3.rc5.40.g2f82" "Git Manual"
+.TH "GIT\-FAST\-IMPORT" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
If the source material uses RFC 2822 style dates, the frontend should let fast\-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild.
-Frontends should prefer the raw format if the source material already uses UNIX\-epoch format, can be coaxed to give dates in that format, or its format is easiliy convertible to it, as there is no ambiguity in parsing.
+Frontends should prefer the raw format if the source material already uses UNIX\-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing.
.TP
now
Always use the current time and timezone. The literal now must always be supplied for <when>.
The data command following committer must supply the commit message (see below for data command syntax). To import an empty commit message use a 0 length data. Commit messages are free\-form and are not interpreted by Git. Currently they must be encoded in UTF\-8, as fast\-import does not permit other encodings to be specified.
-Zero or more filemodify, filedelete, filecopy, filerename and filedeleteall commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a filedeleteall command preceed all filemodify, filecopy and filerename commands in the same commit, as filedeleteall wipes the branch clean (see below).
+Zero or more filemodify, filedelete, filecopy, filerename and filedeleteall commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a filedeleteall command precede all filemodify, filecopy and filerename commands in the same commit, as filedeleteall wipes the branch clean (see below).
The LF after the command is optional (it used to be required).
.sp
\(bu
A mark reference, :<idnum>, where <idnum> is the mark number.
-The reason fast\-import uses : to denote a mark reference is this character is not legal in a Git branch name. The leading : makes it easy to distingush between the mark 42 (:42) and the branch 42 (42 or refs/heads/42), or an abbreviated SHA\-1 which happened to consist only of base\-10 digits.
+The reason fast\-import uses : to denote a mark reference is this character is not legal in a Git branch name. The leading : makes it easy to distinguish between the mark 42 (:42) and the branch 42 (42 or refs/heads/42), or an abbreviated SHA\-1 which happened to consist only of base\-10 digits.
Marks must be declared (via mark) before they can be used.
.TP
If an LF or double quote must be encoded into <path> shell\-style quoting should be used, e.g. "path/with\\n and \\" in it".
-The value of <path> must be in canoncial form. That is it must not:
+The value of <path> must be in canonical form. That is it must not:
.TP 3
\(bu
contain an empty directory component (e.g. foo//bar is invalid),
The LF after <raw> is optional (it used to be required) but recommended. Always including it makes debugging a fast\-import stream easier as the next command always starts in column 0 of the next line, even if <raw> did not end with an LF.
.TP
Delimited format
-A delimiter string is used to mark the end of the data. fast\-import will compute the length by searching for the delimiter. This format is primarly useful for testing and is not recommended for real data.
+A delimiter string is used to mark the end of the data. fast\-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data.
.sp
.nf
'data' SP '<<' <delim> LF
After fast\-import terminates the frontend will need to do rm .git/TAG_FIXUP to remove the dummy branch.
.SS "Import Now, Repack Later"
-As soon as fast\-import completes the Git repository is completely valid and ready for use. Typicallly this takes only a very short time, even for considerably large projects (100,000+ commits).
+As soon as fast\-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits).
However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if \-f and a large \-\-window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!
For this reason it is strongly recommended that users repack the repository with git repack \-a \-d after fast\-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the \-f option to force recomputation of all deltas can significantly reduce the final packfile size (30\-50% smaller can be quite typical).
.SH "MEMORY UTILIZATION"
-There are a number of factors which affect how much memory fast\-import requires to perform an import. Like critical sections of core Git, fast\-import uses its own memory allocators to ammortize any overheads associated with malloc. In practice fast\-import tends to ammoritize any malloc overheads to 0, due to its use of large block allocations.
+There are a number of factors which affect how much memory fast\-import requires to perform an import. Like critical sections of core Git, fast\-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast\-import tends to amortize any malloc overheads to 0, due to its use of large block allocations.
.SS "per object"
fast\-import maintains an in\-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast\-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory.
fast\-import automatically moves active branches to inactive status based on a simple least\-recently\-used algorithm. The LRU chain is updated on each commit command. The maximum number of active branches can be increased or decreased on the command line with \-\-active\-branches=.
.SS "per active tree"
-Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see \(lqper active file\(rq below). The cost of a tree is virtually 0, as its overhead ammortizes out over the individual file entries.
+Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see \(lqper active file\(rq below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries.
.SS "per active file entry"
Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename \(lqMakefile\(rq to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project.
.\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-FMT\-MERGE\-MSG" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.sp
.nf
git\-fmt\-merge\-msg [\-\-summary | \-\-no\-summary] <$GIT_DIR/FETCH_HEAD
-git\-fmt\-merge\-msg [\-\-summary | \-\-no\-summray] \-F <file>
+git\-fmt\-merge\-msg [\-\-summary | \-\-no\-summary] \-F <file>
.fi
.SH "DESCRIPTION"
Takes the list of merged objects on stdin and produces a suitable commit message to be used for the merge commit, usually to be passed as the \fI<merge\-message>\fR argument of git\-merge.
.\" 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" "07/27/2007" "Git 1.5.3.rc3.13.g7ab3" "Git Manual"
+.TH "GIT\-FORMAT\-PATCH" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Instead of the standard \fI[PATCH]\fR prefix in the subject line, instead use \fI[<Subject\-Prefix>]\fR. This allows for useful naming of a patch series, and can be combined with the \-\-numbered option.
.TP
\-\-suffix=.<sfx>
-Instead of using .patch as the suffix for generated filenames, use specifed suffix. A common alternative is \-\-suffix=.txt.
+Instead of using .patch as the suffix for generated filenames, use specified suffix. A common alternative is \-\-suffix=.txt.
Note that you would need to include the leading dot . if you want a filename like 0001\-description\-of\-my\-change.patch, and the first letter does not have to be a dot. Leaving it empty would not add any suffix.
.SH "CONFIGURATION"
.\" 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\-GUI" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-GUI" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\fIgitk(1)\fR
The git repository browser. Shows branches, commit history and file differences. gitk is the utility started by git\-gui's Repository Visualize actions.
.SH "OTHER"
-git\-gui is actually maintained as an independent project, but stable versions are distributed as part of the Git suite for the convience of end users.
+git\-gui is actually maintained as an independent project, but stable versions are distributed as part of the Git suite for the convenience of end users.
A git\-gui development repository can be obtained from:
.sp
.\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-HTTP\-FETCH" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Writes the commit\-id into the filename under $GIT_DIR/refs/<filename> on the local end after the transfer is complete.
.TP
\-\-stdin
-Instead of a commit id on the commandline (which is not expected in this case), \fIgit\-http\-fetch\fR expects lines on stdin in the format
+Instead of a commit id on the command line (which is not expected in this case), \fIgit\-http\-fetch\fR expects lines on stdin in the format
.sp
.nf
<commit\-id>['\\t'<filename\-as\-in\-\-w>]
.\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-LOCAL\-FETCH" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Writes the commit\-id into the filename under $GIT_DIR/refs/<filename> on the local end after the transfer is complete.
.TP
\-\-stdin
-Instead of a commit id on the commandline (which is not expected in this case), \fIgit\-local\-fetch\fR expects lines on stdin in the format
+Instead of a commit id on the command line (which is not expected in this case), \fIgit\-local\-fetch\fR expects lines on stdin in the format
.sp
.nf
<commit\-id>['\\t'<filename\-as\-in\-\-w>]
.\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-NAME\-REV" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Read from stdin, append "(<rev_name>)" to all sha1's of nameable commits, and pass to stdout
.TP
\-\-name\-only
-Instead of printing both the SHA\-1 and the name, print only the name. If given with \-\-tags the usual tag prefix of "tags/" is also ommitted from the name, matching the output of \fB:git\-describe\fR(1) more closely. This option cannot be combined with \-\-stdin.
+Instead of printing both the SHA\-1 and the name, print only the name. If given with \-\-tags the usual tag prefix of "tags/" is also omitted from the name, matching the output of \fB:git\-describe\fR(1) more closely. This option cannot be combined with \-\-stdin.
.SH "EXAMPLE"
Given a commit, find out where it is relative to the local refs. Say somebody wrote you about that fantastic commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a. Of course, you look into the commit, but that only tells you what happened, but not the context.
.\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-RECEIVE\-PACK" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
The hook should exit with non\-zero status if it wants to disallow updating the named ref. Otherwise it should exit with zero.
-Successful execution (a zero exit status) of this hook does not ensure the ref will actully be updated, it is only a prerequisite. As such it is not a good idea to send notices (e.g. email) from this hook. Consider using the post\-receive hook instead.
+Successful execution (a zero exit status) of this hook does not ensure the ref will actually be updated, it is only a prerequisite. As such it is not a good idea to send notices (e.g. email) from this hook. Consider using the post\-receive hook instead.
.SH "POST\-RECEIVE HOOK"
After all refs were updated (or attempted to be updated), if any ref update was successful, and if $GIT_DIR/hooks/post\-receive file exists and is executable, it will be invoke once with no parameters. The standard input of the hook will be one line for each successfully updated ref:
.sp
.\" 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" "08/19/2007" "Git 1.5.3.rc5.40.g2f82" "Git Manual"
+.TH "GIT\-REFLOG" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
The subcommand "expire" is used to prune older reflog entries. Entries older than expire time, or entries older than expire\-unreachable time and are not reachable from the current tip, are removed from the reflog. This is typically not used directly by the end users \(em instead, see \fBgit\-gc\fR(1).
-The subcommand "show" (which is also the default, in the absense of any subcommands) will take all the normal log options, and show the log of HEAD, which will cover all recent actions, including branch switches. It is basically an alias for \fIgit log \-g \-\-abbrev\-commit \-\-pretty=oneline\fR, see \fBgit\-log\fR(1).
+The subcommand "show" (which is also the default, in the absence of any subcommands) will take all the normal log options, and show the log of HEAD, which will cover all recent actions, including branch switches. It is basically an alias for \fIgit log \-g \-\-abbrev\-commit \-\-pretty=oneline\fR, see \fBgit\-log\fR(1).
.SH "OPTIONS"
.TP
\-\-stale\-fix
.\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GIT\-REPACK" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "SYNOPSIS"
\fIgit\-repack\fR [\-a] [\-d] [\-f] [\-l] [\-n] [\-q] [\-\-window=N] [\-\-depth=N]
.SH "DESCRIPTION"
-This script is used to combine all objects that do not currently reside in a "pack", into a pack. It can also be used to re\-organise existing packs into a single, more efficient pack.
+This script is used to combine all objects that do not currently reside in a "pack", into a pack. It can also be used to re\-organize existing packs into a single, more efficient pack.
A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an associated index file.
.\" 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" "08/23/2007" "Git 1.5.3.rc6.9.gaabb2" "Git Manual"
+.TH "GIT\-REV\-LIST" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\-\-date=rfc (or \-\-date=rfc2822) shows timestamps in RFC 2822 format, often found in E\-mail messages.
-\-\-date=short shows only date but not time, in YYYY\-MM\-DD fomat.
+\-\-date=short shows only date but not time, in YYYY\-MM\-DD format.
\-\-date=default shows timestamps in the original timezone (either committer's or author's).
.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\-SVN" "1" "08/23/2007" "Git 1.5.3.rc6.17.g1911" "Git Manual"
+.TH "GIT\-SVN" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\fIrebase\fR
This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it.
-This works similarly to \fIsvn update\fR or \fIgit\-pull\fR except that it preserves linear history with \fIgit\-rebase\fR instead of \fIgit\-merge\fR for ease of dcommit\-ing with git\-svn.
+This works similarly to \fIsvn update\fR or \fIgit\-pull\fR except that it preserves linear history with \fIgit\-rebase\fR instead of \fIgit\-merge\fR for ease of dcommiting with git\-svn.
This accepts all options that \fIgit\-svn fetch\fR and \fIgit\-rebase\fR accepts. However \fI\-\-fetch\-all\fR only fetches from the current [svn\-remote], and not all [svn\-remote] definitions.
.ft
.fi
-Keep in mind that the \fI\fR\fI (asterisk) wildcard of the local ref (left of the \fR\fI\fI:\fR\fR\fI) *must\fR be the farthest right path component; however the remote wildcard may be anywhere as long as it's own independent path componet (surrounded by \fI/\fR or EOL). This type of configuration is not automatically created by \fIinit\fR and should be manually entered with a text\-editor or using \fBgit\-config\fR(1)
+Keep in mind that the \fI\fR\fI (asterisk) wildcard of the local ref (left of the \fR\fI\fI:\fR\fR\fI) *must\fR be the farthest right path component; however the remote wildcard may be anywhere as long as it's own independent path component (surrounded by \fI/\fR or EOL). This type of configuration is not automatically created by \fIinit\fR and should be manually entered with a text\-editor or using \fBgit\-config\fR(1)
.SH "SEE ALSO"
\fBgit\-rebase\fR(1)
.SH "AUTHOR"
.\" 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" "07/30/2007" "Git 1.5.3.rc3.91.g5c75" "Git Manual"
+.TH "GITATTRIBUTES" "5" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ft
.fi
-Note. A single level of backslashes are eaten by the configuration file parser, so you would need to double the backslashes; the pattern above picks a line that begins with a backslash, and zero or more occurences of sub followed by section followed by open brace, to the end of line.
+Note. A single level of backslashes are eaten by the configuration file parser, so you would need to double the backslashes; the pattern above picks a line that begins with a backslash, and zero or more occurrences of sub followed by section followed by open brace, to the end of line.
There are a few built\-in patterns to make this easier, and tex is one of them, so you do not have to write the above in your configuration file (you still need to enable this with the attribute mechanism, via .gitattributes). Another built\-in pattern is defined for java that defines a pattern suitable for program text in Java language.
.RE
the attributes given to path t/abc are computed as follows:
.TP 3
1.
-By examining t/.gitattributes (which is in the same diretory as the path in question), git finds that the first line matches. merge attribute is set. It also finds that the second line matches, and attributes foo and bar are unset.
+By examining t/.gitattributes (which is in the same directory as the path in question), git finds that the first line matches. merge attribute is set. It also finds that the second line matches, and attributes foo and bar are unset.
.TP
2.
Then it examines .gitattributes (which is in the parent directory), and finds that the first line matches, but t/.gitattributes file already decided how merge, foo and bar attributes should be given to this path, so it leaves foo and bar unset. Attribute baz is set.
3.
Finally it examines $GIT_DIR/info/attributes. This file is used to override the in\-tree settings. The first line is a match, and foo is set, bar is reverted to unspecified state, and baz is unset.
-As the result, the attributes assignement to t/abc becomes:
+As the result, the attributes assignment to t/abc becomes:
.sp
.nf
.ft C
projects / git.git / commitdiff