From: Junio C Hamano Date: Tue, 23 Oct 2007 01:23:35 +0000 (+0000) Subject: Autogenerated manpages for v1.5.3.4-319-gdd817 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=07afc91832de4a77d497f2790eedc8e20790e148;p=git.git Autogenerated manpages for v1.5.3.4-319-gdd817 --- diff --git a/man1/git-archive.1 b/man1/git-archive.1 index 861dd2297..ff6b194e2 100644 --- a/man1/git-archive.1 +++ b/man1/git-archive.1 @@ -2,7 +2,7 @@ .\" 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" "09/15/2007" "Git 1.5.3.1.91.gd3392" "Git Manual" +.TH "GIT\-ARCHIVE" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -13,7 +13,8 @@ git\-archive \- Create an archive of files from a named tree .sp .nf \fIgit\-archive\fR \-\-format= [\-\-list] [\-\-prefix=/] [] - [\-\-remote=] [path\&...] + [\-\-remote= [\-\-exec=]] + [path\&...] .fi .SH "DESCRIPTION" Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If is specified it is prepended to the filenames in the archive. @@ -39,6 +40,9 @@ This can be any options that the archiver backend understand. See next section. \-\-remote= Instead of making a tar archive from local repository, retrieve a tar archive from a remote repository. .TP +\-\-exec= +Used with \-\-remote to specify the path to the git\-upload\-archive executable on the remote side. +.TP The tree or commit to produce an archive for. .TP diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index 0c9437376..06105bb56 100644 --- a/man1/git-cherry-pick.1 +++ b/man1/git-cherry-pick.1 @@ -2,7 +2,7 @@ .\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -22,7 +22,7 @@ Commit to cherry\-pick. For a more complete list of ways to spell commits, see " With this option, git\-cherry\-pick will let you edit the commit message prior committing. .TP \-x -Cause the command to append which commit was cherry\-picked after the original commit message when making a commit. Do not use this option if you are cherry\-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry\-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful. +When recording the commit, append to the original commit message a note that indicates which commit this change was cherry\-picked from. Append the note only for cherry picks without conflicts. Do not use this option if you are cherry\-picking from your private branch because the information is useless to the recipient. If on the other hand you are cherry\-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful. .TP \-r It used to be that the command defaulted to do \-x described above, and \-r was to disable it. Now the default is not to do \-x so this option is a no\-op. diff --git a/man1/git-config.1 b/man1/git-config.1 index f1a47bb93..d58d6123f 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,7 +2,7 @@ .\" 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" "10/03/2007" "Git 1.5.3.4.203.gcc61a" "Git Manual" +.TH "GIT\-CONFIG" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -357,7 +357,7 @@ If true this repository is assumed to be \fIbare\fR and has no working directory This setting is automatically guessed by \fBgit\-clone\fR(1) or \fBgit\-init\fR(1) when the repository was created. By default a repository that ends in "/.git" is assumed to be not bare (bare = false), while all other repositories are assumed to be bare (bare = true). .TP core.worktree -Set the path to the working tree. The value will not be used in combination with repositories found automatically in a .git directory (i.e. $GIT_DIR is not set). This can be overriden by the GIT_WORK_TREE environment variable and the \fI\-\-work\-tree\fR command line option. +Set the path to the working tree. The value will not be used in combination with repositories found automatically in a .git directory (i.e. $GIT_DIR is not set). This can be overridden by the GIT_WORK_TREE environment variable and the \fI\-\-work\-tree\fR command line option. .TP core.logAllRefUpdates Enable the reflog. Updates to a ref is logged to the file "$GIT_DIR/logs/", by appending the new and old SHA1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to true, missing "$GIT_DIR/logs/" file is automatically created for branch heads. @@ -565,7 +565,7 @@ merge.tool Controls which merge resolution program is used by \fBgit\-mergetool\fR(1). Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". .TP merge.verbosity -Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overriden by \fIGIT_MERGE_VERBOSITY\fR environment variable. +Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by \fIGIT_MERGE_VERBOSITY\fR environment variable. .TP merge..name Defines a human readable name for a custom low\-level merge driver. See \fBgitattributes\fR(5) for details. diff --git a/man1/git-diff.1 b/man1/git-diff.1 index c49379b73..7dbcf5fd9 100644 --- a/man1/git-diff.1 +++ b/man1/git-diff.1 @@ -2,7 +2,7 @@ .\" 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" "10/03/2007" "Git 1.5.3.4.203.gcc61a" "Git Manual" +.TH "GIT\-DIFF" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -228,7 +228,7 @@ $ git diff topic...master \fB(3)\fR .br \fB2. \fRSame as above. .br -\fB3. \fRChanges that occured on the master branch since when the topic branch was started off it. +\fB3. \fRChanges that occurred on the master branch since when the topic branch was started off it. .br .TP Limiting the diff output diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index 1a4b20758..b76f4adc4 100644 --- a/man1/git-filter-branch.1 +++ b/man1/git-filter-branch.1 @@ -2,7 +2,7 @@ .\" 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\-FILTER\-BRANCH" "1" "09/14/2007" "Git 1.5.3.1.56.g611d" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -95,7 +95,7 @@ git filter\-branch \-\-index\-filter 'git update\-index \-\-remove filename' HEA .ft .fi -Now, you will get the rewritten history saved in the branch \fInewbranch\fR (your current branch is left untouched). +Now, you will get the rewritten history saved in HEAD. To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history: .sp diff --git a/man1/git-gc.1 b/man1/git-gc.1 index c2bb5561a..d84f88b7d 100644 --- a/man1/git-gc.1 +++ b/man1/git-gc.1 @@ -2,7 +2,7 @@ .\" 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" "10/03/2007" "Git 1.5.3.4.203.gcc61a" "Git Manual" +.TH "GIT\-GC" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,7 +14,7 @@ git\-gc \- Cleanup unnecessary files and optimize the local repository .SH "DESCRIPTION" Runs a number of housekeeping tasks within the current repository, such as compressing file revisions (to reduce disk space and increase performance) and removing unreachable objects which may have been created from prior invocations of \fBgit\-add\fR(1). -Users are encouraged to run this task on a regular basis within each repository to maintain good disk space utilization and good operating performance. +Users are encouraged to run this task on a regular basis within each repository to maintain good disk space utilization and good operating performance. Some git commands may automatically run git\-gc; see the \-\-auto flag below for details. .SH "OPTIONS" .TP \-\-prune @@ -24,7 +24,11 @@ Usually git\-gc packs refs, expires old reflog entries, packs loose objects, and 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. .TP \-\-auto -With this option, git gc checks if there are too many loose objects in the repository and runs \fBgit\-repack\fR(1) with \-d \-l option to pack them. The threshold for loose objects is set with gc.auto configuration variable, and can be disabled by setting it to 0. Some Porcelain commands use this after they perform operation that could create many loose objects automatically. Additionally, when there are too many packs are present, they are consolidated into one larger pack by running the git\-repack command with \-A option. The threshold for number of packs is set with gc.autopacklimit configuration variable. +With this option, git gc checks whether any housekeeping is required; if not, it exits without performing any work. Some git commands run git gc \-\-auto after performing operations that could create many loose objects. + +Housekeeping is required if there are too many loose objects or too many packs in the repository. If the number of loose objects exceeds the value of the gc.auto configuration variable, then all loose objects are combined into a single pack using git\-repack \-d \-l. Setting the value of gc.auto to 0 disables automatic packing of loose objects. + +If the number of packs exceeds the value of gc.autopacklimit, then existing packs (except those marked with a .keep file) are consolidated into a single pack by using the \-A option of git\-repack. Setting gc.autopacklimit to 0 disables automatic consolidation of packs. .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. diff --git a/man1/git-index-pack.1 b/man1/git-index-pack.1 index 217d42dd9..f72e27193 100644 --- a/man1/git-index-pack.1 +++ b/man1/git-index-pack.1 @@ -2,7 +2,7 @@ .\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-INDEX\-PACK" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -27,7 +27,7 @@ Be verbose about what is going on, including progress status. Write the generated pack index into the specified file. Without this option the name of pack index file is constructed from the name of packed archive file by replacing .pack with .idx (and the program fails if the name of packed archive does not end with .pack). .TP \-\-stdin -When this flag is provided, the pack is read from stdin instead and a copy is then written to . If is not specified, the pack is written to objects/pack/ directory of the current git repository with a default name determined from the pack content. If is not specified consider using \-\-keep to prevent a race condition between this process and \fB:git\-repack\fR(1) . +When this flag is provided, the pack is read from stdin instead and a copy is then written to . If is not specified, the pack is written to objects/pack/ directory of the current git repository with a default name determined from the pack content. If is not specified consider using \-\-keep to prevent a race condition between this process and \fB:git\-repack\fR(1). .TP \-\-fix\-thin It is possible for \fBgit\-pack\-objects\fR(1) to build "thin" pack, which records objects in deltified form based on objects not included in the pack to reduce network traffic. Those objects are expected to be present on the receiving end and they must be included in the pack for that pack to be self contained and indexable. Without this option any attempt to index a thin pack will fail. This option only makes sense in conjunction with \-\-stdin. diff --git a/man1/git-instaweb.1 b/man1/git-instaweb.1 index 75701a59f..f545d0b1c 100644 --- a/man1/git-instaweb.1 +++ b/man1/git-instaweb.1 @@ -2,7 +2,7 @@ .\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-INSTAWEB" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -24,7 +24,7 @@ A simple script to setup gitweb and a web server for browsing the local reposito Only bind the web server to the local IP (127.0.0.1). .TP \-d|\-\-httpd -The HTTP daemon command\-line that will be executed. Command\-line options may be specified here, and the configuration file will be added at the end of the command\-line. Currently, lighttpd and apache2 are the only supported servers. (Default: lighttpd) +The HTTP daemon command\-line that will be executed. Command\-line options may be specified here, and the configuration file will be added at the end of the command\-line. Currently lighttpd, apache2 and webrick are supported. (Default: lighttpd) .TP \-m|\-\-module\-path The module path (only needed if httpd is Apache). (Default: /usr/lib/apache2/modules) diff --git a/man1/git-merge-index.1 b/man1/git-merge-index.1 index 0be7e8f1d..083943a54 100644 --- a/man1/git-merge-index.1 +++ b/man1/git-merge-index.1 @@ -2,7 +2,7 @@ .\" 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-MERGE\-INDEX" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -29,7 +29,7 @@ Do not complain about failed merge program (the merge program failure usually in If "git\-merge\-index" is called with multiple s (or \-a) then it processes them in turn only stopping if merge returns a non\-zero exit code. -Typically this is run with the a script calling git's imitation of the merge command from the RCS package. +Typically this is run with a script calling git's imitation of the merge command from the RCS package. A sample script called "git\-merge\-one\-file" is included in the distribution. diff --git a/man1/git-push.1 b/man1/git-push.1 index 4de6619c8..920a9a2e5 100644 --- a/man1/git-push.1 +++ b/man1/git-push.1 @@ -2,7 +2,7 @@ .\" 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" "09/19/2007" "Git 1.5.3.1.153.g89df5" "Git Manual" +.TH "GIT\-PUSH" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ git\-push \- Update remote refs along with associated objects .SH "SYNOPSIS" .sp .nf -\fIgit\-push\fR [\-\-all] [\-\-tags] [\-\-receive\-pack=] +\fIgit\-push\fR [\-\-all] [\-\-dry\-run] [\-\-tags] [\-\-receive\-pack=] [\-\-repo=all] [\-f | \-\-force] [\-v] [ \&...] .fi .SH "DESCRIPTION" @@ -42,6 +42,9 @@ Pushing an empty allows you to delete the ref from the remote reposi \-\-all Instead of naming each ref to push, specifies that all refs under $GIT_DIR/refs/heads/ be pushed. .TP +\-\-dry\-run +Do everything except actually send the updates. +.TP \-\-tags All refs under $GIT_DIR/refs/tags are pushed, in addition to refspecs explicitly listed on the command line. .TP diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index 1820b16c0..61ef1337b 100644 --- a/man1/git-rebase.1 +++ b/man1/git-rebase.1 @@ -2,7 +2,7 @@ .\" 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" "09/30/2007" "Git 1.5.3.3.126.g72dc" "Git Manual" +.TH "GIT\-REBASE" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -24,7 +24,7 @@ All changes made by commits in the current branch but that are not in The current branch is reset to , or if the \-\-onto option was supplied. This has the exact same effect as git reset \-\-hard (or ). -The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. +The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in HEAD which introduce the same textual changes as a commit in HEAD.. are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped). It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run git rebase \-\-continue. Another option is to bypass the commit that caused the merge failure with git rebase \-\-skip. To restore the original and remove the .dotest working files, use the command git rebase \-\-abort instead. @@ -56,6 +56,26 @@ would be: .fi The latter form is just a short\-hand of git checkout topic followed by git rebase master. +If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. For example, running git\-rebase master on the following history (in which A' and A introduce the same set of changes, but have different committer information): +.sp +.nf +.ft C + A\-\-\-B\-\-\-C topic + / + D\-\-\-E\-\-\-A'\-\-\-F master +.ft + +.fi +will result in: +.sp +.nf +.ft C + B'\-\-\-C' topic + / + D\-\-\-E\-\-\-A'\-\-\-F master +.ft + +.fi Here is how you would transplant a topic branch based on one branch to another, to pretend that you forked the topic branch from the latter branch, using rebase \-\-onto. First let's assume your \fItopic\fR is based on branch \fInext\fR. For example feature developed in \fItopic\fR depends on some functionality which is found in \fInext\fR. diff --git a/man1/git-reflog.1 b/man1/git-reflog.1 index c93e1f631..992642ef7 100644 --- a/man1/git-reflog.1 +++ b/man1/git-reflog.1 @@ -2,7 +2,7 @@ .\" 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/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual" +.TH "GIT\-REFLOG" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -15,7 +15,7 @@ git\-reflog \- Manage reflog information The command takes various subcommands, and different options depending on the subcommand: .sp .nf -git reflog expire [\-\-dry\-run] [\-\-stale\-fix] +git reflog expire [\-\-dry\-run] [\-\-stale\-fix] [\-\-verbose] [\-\-expire=