.\" 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/22/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
+.TH "GIT\-ANNOTATE" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\-\-show\-stats
Include additional statistics at the end of blame output.
.TP
-\-L n,m
-Annotate only the specified line range (lines count from 1).
+\-L <start>,<end>
+Annotate only the given line range. <start> and <end> can take one of these forms:
+.RS
+.TP 3
+\(bu
+number
+
+If <start> or <end> is a number, it specifies an absolute line number (lines count from 1).
+.TP
+\(bu
+/regex/
+
+This form will use the first line matching the given POSIX regex. If <end> is a regex, it will search starting at the line given by <start>.
+.TP
+\(bu
++offset or \-offset
+
+This is only valid for <end> and will specify a number of lines before or after the line given by <start>.
+.RE
.TP
\-l
Show long rev (Default: off).
.\" 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/22/2007" "Git 1.5.1.1.135.gf948" "Git Manual"
+.TH "GIT\-BLAME" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\-\-show\-stats
Include additional statistics at the end of blame output.
.TP
-\-L n,m
-Annotate only the specified line range (lines count from 1).
+\-L <start>,<end>
+Annotate only the given line range. <start> and <end> can take one of these forms:
+.RS
+.TP 3
+\(bu
+number
+
+If <start> or <end> is a number, it specifies an absolute line number (lines count from 1).
+.TP
+\(bu
+/regex/
+
+This form will use the first line matching the given POSIX regex. If <end> is a regex, it will search starting at the line given by <start>.
+.TP
+\(bu
++offset or \-offset
+
+This is only valid for <end> and will specify a number of lines before or after the line given by <start>.
+.RE
.TP
\-l
Show long rev (Default: off).
.\" 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" "04/22/2007" "" ""
+.TH "GIT\-DIFF\-FILES" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "NAME"
git\-diff\-files \- Compares files in the working tree and the index
.SH "SYNOPSIS"
-\fIgit\-diff\-files\fR [\-q] [\-0|\-1|\-2|\-3|\-c|\-\-cc|\-
n|\-\-no\-index] [<common diff options>] [<path>\&...]
+\fIgit\-diff\-files\fR [\-q] [\-0|\-1|\-2|\-3|\-c|\-\-cc|\-\-no\-index] [<common diff options>] [<path>\&...]
.SH "DESCRIPTION"
Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the same as "git\-diff\-index" and "git\-diff\-tree".
.SH "OPTIONS"
\-c,\-\-cc
This compares stage 2 (our branch), stage 3 (their branch) and the working tree file and outputs a combined diff, similar to the way \fIdiff\-tree\fR shows a merge commit with these flags.
.TP
-\\\-n,\-\-no\-index
+\-\-no\-index
Compare the two given files / directories.
.TP
\-q
.\" 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/22/2007" "" ""
+.TH "GIT\-FETCH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
When <refspec> stores the fetched result in tracking branches, the tags that point at these branches are automatically followed. This is done by first fetching from the remote using the given <refspec>s, and if the repository has objects that are pointed by remote tags that it does not yet have, then fetch those missing tags. If the other end has tags that point at branches you are not interested in, you will not get them.
.SH "OPTIONS"
.TP
+\-q, \-\-quiet
+Pass \-\-quiet to git\-fetch\-pack and silence any other internally used programs.
+.TP
+\-v, \-\-verbose
+Be verbose.
+.TP
\-a, \-\-append
Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD. Without this option old data in .git/FETCH_HEAD will be overwritten.
.TP
\-f, \-\-force
When git\-fetch is used with <rbranch>:<lbranch> refspec, it refuses to update the local branch <lbranch> unless the remote branch <rbranch> it fetches is a descendant of <lbranch>. This option overrides that check.
.TP
-\-\-no\-tags
+\-n, \-\-no\-tags
By default, git\-fetch fetches tags that point at objects that are downloaded from the remote repository and stores them locally. This option disables this automatic tag following.
.TP
\-t, \-\-tags
.\" 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" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-FMT\-MERGE\-MSG" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "NAME"
git\-fmt\-merge\-msg \- Produce a merge commit message
.SH "SYNOPSIS"
-\fIgit\-fmt\-merge\-msg\fR <$GIT_DIR/FETCH_HEAD
+git\-fmt\-merge\-msg [\-\-summary | \-\-no\-summary] <$GIT_DIR/FETCH_HEAD git\-fmt\-merge\-msg [\-\-summary | \-\-no\-summray] \-F <file>
.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.
This script is intended mostly for internal use by scripts automatically invoking git\-merge.
+.SH "OPTIONS"
+.TP
+\-\-summary
+In addition to branch names, populate the log message with one\-line descriptions from the actual commits that are being merged.
+.TP
+\-\-no\-summary
+Do not list one\-line descriptions from the actual commits being merged.
+.TP
+\-\-file <file>, \-F <file>
+Take the list of merged objects from <file> instead of stdin.
+.SH "CONFIGURATION"
+.TP
+merge.summary
+Whether to include summaries of merged commits in newly merge commit messages. False by default.
.SH "SEE ALSO"
\fBgit\-merge\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 "GIT\-GREP" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-GREP" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\fIgit\-grep\fR [\-\-cached]
[\-a | \-\-text] [\-I] [\-i | \-\-ignore\-case] [\-w | \-\-word\-regexp]
[\-v | \-\-invert\-match] [\-h|\-H] [\-\-full\-name]
- [\-E | \-\-extended\-regexp] [\-G | \-\-basic\-regexp] [\-F | \-\-fixed\-strings]
- [\-n] [\-l | \-\-files\-with\-matches] [\-L | \-\-files\-without\-match]
+ [\-E | \-\-extended\-regexp] [\-G | \-\-basic\-regexp]
+ [\-F | \-\-fixed\-strings] [\-n]
+ [\-l | \-\-files\-with\-matches] [\-L | \-\-files\-without\-match]
[\-c | \-\-count] [\-\-all\-match]
[\-A <post\-context>] [\-B <pre\-context>] [\-C <context>]
- [\-f <file>] [\-e] <pattern> [\-\-and|\-\-or|\-\-not|(|)|\-e <pattern>\&...]
- [<tree>\&...]
+ [\-f <file>] [\-e] <pattern>
+ [\-\-and|\-\-or|\-\-not|(|)|\-e <pattern>\&...] [<tree>\&...]
[\-\-] [<path>\&...]
.fi
.SH "DESCRIPTION"
\-i | \-\-ignore\-case
Ignore case differences between the patterns and the files.
.TP
+\-I
+Don't match the pattern in binary files.
+.TP
\-w | \-\-word\-regexp
Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non\-word character; end at the end of a line or followed by a non\-word character).
.TP
\-E | \-\-extended\-regexp | \-G | \-\-basic\-regexp
Use POSIX extended/basic regexp for patterns. Default is to use basic regexp.
.TP
+\-F | \-\-fixed\-strings
+Use fixed strings for patterns (don't interpret pattern as a regex).
+.TP
\-n
Prefix the line number to matching lines.
.TP
\-[ABC] <context>
Show context trailing (A \(em after), or leading (B \(em before), or both (C \(em context) lines, and place a line containing \-\- between contiguous groups of matches.
.TP
+\-<num>
+A shortcut for specifying \-C<num>.
+.TP
\-f <file>
Read patterns from <file>, one per line.
.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\-HTTP\-FETCH" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-HTTP\-FETCH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.nf
<commit\-id>['\\t'<filename\-as\-in\-\-w>]
.fi
+.TP
+\-\-recover
+Verify that everything reachable from target is fetched. Used after an earlier fetch is interrupted.
.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\-HTTP\-PUSH" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-HTTP\-PUSH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.SH "NAME"
git\-http\-push \- Push objects over HTTP/DAV to another repository
.SH "SYNOPSIS"
-\fIgit\-http\-push\fR [\-\-complete] [\-\-force] [\-\-verbose] <url> <ref> [<ref>\&...]
+\fIgit\-http\-push\fR [\-\-all] [\-\-force] [\-\-verbose] <url> <ref> [<ref>\&...]
.SH "DESCRIPTION"
Sends missing objects to remote repository, and updates the remote branch.
.SH "OPTIONS"
.TP
-\-\-complete
+\-\-all
Do not assume that the remote repository is complete in its current state, and verify all objects in the entire local ref's history exist in the remote repository.
.TP
\-\-force
\-\-verbose
Report the list of objects being walked locally and the list of objects successfully sent to the remote repository.
.TP
+\-d, \-D
+Remove <ref> from remote repository. The specified branch cannot be the remote HEAD. If \-d is specified the following other conditions must also be met:
+.RS
+.TP 3
+\(bu
+Remote HEAD must resolve to an object that exists locally
+.TP
+\(bu
+Specified branch resolves to an object that exists locally
+.TP
+\(bu
+Specified branch is an ancestor of the remote HEAD
+.RE
+.TP
<ref>\&...
The remote refs to update.
.SH "SPECIFYING THE REFS"
.\" 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" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual"
+.TH "GIT\-LOCAL\-FETCH" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\-v
Report what is downloaded.
.TP
+\-s
+Instead of regular file\-to\-file copying use symbolic links to the objects in the remote repository.
+.TP
+\-l
+Before attempting symlinks (if \-s is specified) or file\-to\-file copying the remote objects, try to hardlink the remote objects into the local repository.
+.TP
+\-n
+Never attempt to file\-to\-file copy remote objects. Only useful with \-s or \-l command\-line options.
+.TP
\-w <filename>
Writes the commit\-id into the filename under $GIT_DIR/refs/<filename> on the local end after the transfer is complete.
.TP
.nf
<commit\-id>['\\t'<filename\-as\-in\-\-w>]
.fi
+.TP
+\-\-recover
+Verify that everything reachable from target is fetched. Used after an earlier fetch is interrupted.
.SH "AUTHOR"
Written by 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\-PULL" "1" "04/22/2007" "" ""
+.TH "GIT\-PULL" "1" "04/27/2007" "Git 1.5.2.rc0.71.g4342" "Git Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\-s <strategy>, \-\-strategy=<strategy>
Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no \-s option, a built\-in list of strategies is used instead (git\-merge\-recursive when merging a single head, git\-merge\-octopus otherwise).
.TP
+\-q, \-\-quiet
+Pass \-\-quiet to git\-fetch\-pack and silence any other internally used programs.
+.TP
+\-v, \-\-verbose
+Be verbose.
+.TP
\-a, \-\-append
Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD. Without this option old data in .git/FETCH_HEAD will be overwritten.
.TP
\-f, \-\-force
When git\-fetch is used with <rbranch>:<lbranch> refspec, it refuses to update the local branch <lbranch> unless the remote branch <rbranch> it fetches is a descendant of <lbranch>. This option overrides that check.
.TP
-\-\-no\-tags
+\-n, \-\-no\-tags
By default, git\-fetch fetches tags that point at objects that are downloaded from the remote repository and stores them locally. This option disables this automatic tag following.
.TP
\-t, \-\-tags
projects / git.git / commitdiff