From: Junio C Hamano Date: Mon, 25 Sep 2006 04:46:20 +0000 (+0000) Subject: Autogenerated man pages for v1.4.2.1-g83915 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8b365beb12477c1ed3285aff855c8944233ee93a;p=git.git Autogenerated man pages for v1.4.2.1-g83915 --- diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index a681ecd6c..b99ddab44 100755 --- a/man1/git-daemon.1 +++ b/man1/git-daemon.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\-DAEMON" "1" "09/07/2006" "" "" +.TH "GIT\-DAEMON" "1" "09/25/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -15,6 +15,7 @@ git\-daemon \- A really simple server for git repositories \fIgit\-daemon\fR [\-\-verbose] [\-\-syslog] [\-\-inetd | \-\-port=n] [\-\-export\-all] [\-\-timeout=n] [\-\-init\-timeout=n] [\-\-strict\-paths] [\-\-base\-path=path] [\-\-user\-path | \-\-user\-path=path] + [\-\-interpolated\-path=pathtemplate] [\-\-enable=service] [\-\-disable=service] [\-\-allow\-override=service] [\-\-forbid\-override=service] [\-\-reuseaddr] [\-\-detach] [\-\-pid\-file=file] @@ -43,6 +44,9 @@ git\-daemon will interpret the path as \fI/srv/git/hello.git\fR. .TP +\-\-interpolated\-path=pathtemplate +To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client, and %D for the absolute path of the named repository. +.TP \-\-export\-all Allow pulling from all directories that look like GIT repositories (have the \fIobjects\fR @@ -125,6 +129,45 @@ clients. It is enabled by default, but a repository can disable it by setting daemon.uploadpack configuration item to false. +.SH "EXAMPLES" +.TP +git\-daemon as inetd server +To set up +git\-daemon +as an inetd service that handles any repository under the whitelisted set of directories, /pub/foo and /pub/bar, place an entry like the following into /etc/inetd all on one line: +.sp +.nf + git stream tcp nowait nobody /usr/bin/git\-daemon + git\-daemon \-\-inetd \-\-verbose + \-\-syslog \-\-export\-all + /pub/foo /pub/bar +.fi +.TP +git\-daemon as inetd server for virtual hosts +To set up +git\-daemon +as an inetd service that handles repositories for different virtual hosts, +www.example.com +and +www.example.org, place an entry like the following into +/etc/inetd +all on one line: +.sp +.nf + git stream tcp nowait nobody /usr/bin/git\-daemon + git\-daemon \-\-inetd \-\-verbose + \-\-syslog \-\-export\-all + \-\-interpolated\-path=/pub/%H%D + /pub/www.example.org/software + /pub/www.example.com/software + /software +.fi +In this example, the root\-level directory +/pub +will contain a subdirectory for each virtual host name supported. Further, both hosts advertise repositories simply as +git://www.example.com/software/repo.git. For pre\-1.4.0 clients, a symlink from +/software +into the appropriate default repository could be made as well. .SH "AUTHOR" Written by Linus Torvalds , YOSHIFUJI Hideaki and the git\-list .sp diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1 index 9d2778532..8806ef4b6 100755 --- a/man1/git-repo-config.1 +++ b/man1/git-repo-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\-REPO\-CONFIG" "1" "09/21/2006" "" "" +.TH "GIT\-REPO\-CONFIG" "1" "09/25/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -262,6 +262,16 @@ how to handle whitespaces, in the same way as the option. See \fBgit\-apply\fR(1). .TP +branch..remote +When in branch , it tells +git fetch +which remote to fetch. +.TP +branch..merge +When in branch , it tells +git fetch +the default remote branch to be merged. +.TP pager.color A boolean to enable/disable colored output when the pager is in use (default is true). .TP diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index f847eceec..0370ee394 100755 --- a/man1/git-rev-list.1 +++ b/man1/git-rev-list.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\-REV\-LIST" "1" "09/06/2006" "" "" +.TH "GIT\-REV\-LIST" "1" "09/25/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -23,6 +23,7 @@ git\-rev\-list \- Lists commit objects in reverse chronological order [ \-\-stdin ] [ \-\-topo\-order ] [ \-\-parents ] + [ \-\-(author|committer|grep)= ] [ [\-\-objects | \-\-objects\-edge] [ \-\-unpacked ] ] [ \-\-pretty | \-\-header ] [ \-\-bisect ] @@ -114,6 +115,12 @@ Show commits older than a specific date. \-\-max\-age=\fItimestamp\fR, \-\-min\-age=\fItimestamp\fR Limit the commits output to specified time range. .TP +\-\-author=\fIpattern\fR, \-\-committer=\fIpattern\fR +Limit the commits output to ones with author/committer header lines that match the specified pattern. +.TP +\-\-grep=\fIpattern\fR +Limit the commits output to ones with log message that matches the specified pattern. +.TP \-\-remove\-empty Stop when a given path disappears from the tree. .TP diff --git a/man1/git-svn.1 b/man1/git-svn.1 index e6e630eba..b146b4800 100755 --- a/man1/git-svn.1 +++ b/man1/git-svn.1 @@ -1,249 +1,243 @@ -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "GIT-SVN" 1 "" "" "" -.SH NAME -git-svn \- bidirectional operation between a single Subversion branch and git +.\" ** 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 "GIT\-SVN" "1" "09/25/2006" "" "" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +git\-svn \- bidirectional operation between a single Subversion branch and git .SH "SYNOPSIS" - - \fIgit\-svn\fR [options] [arguments] - +.sp .SH "DESCRIPTION" - - -git\-svn is a simple conduit for changesets between a single Subversion branch and git\&. It is not to be confused with \fBgit\-svnimport\fR(1)\&. They were designed with very different goals in mind\&. - - -git\-svn is designed for an individual developer who wants a bidirectional flow of changesets between a single branch in Subversion and an arbitrary number of branches in git\&. git\-svnimport is designed for read\-only operation on repositories that match a particular layout (albeit the recommended one by SVN developers)\&. - - -For importing svn, git\-svnimport is potentially more powerful when operating on repositories organized under the recommended trunk/branch/tags structure, and should be faster, too\&. - - -git\-svn mostly ignores the very limited view of branching that Subversion has\&. This allows git\-svn to be much easier to use, especially on repositories that are not organized in a manner that git\-svnimport is designed for\&. - +git\-svn is a simple conduit for changesets between a single Subversion branch and git. It is not to be confused with \fBgit\-svnimport\fR(1). They were designed with very different goals in mind. +.sp +git\-svn is designed for an individual developer who wants a bidirectional flow of changesets between a single branch in Subversion and an arbitrary number of branches in git. git\-svnimport is designed for read\-only operation on repositories that match a particular layout (albeit the recommended one by SVN developers). +.sp +For importing svn, git\-svnimport is potentially more powerful when operating on repositories organized under the recommended trunk/branch/tags structure, and should be faster, too. +.sp +git\-svn mostly ignores the very limited view of branching that Subversion has. This allows git\-svn to be much easier to use, especially on repositories that are not organized in a manner that git\-svnimport is designed for. +.sp .SH "COMMANDS" - .TP \fIinit\fR -Creates an empty git repository with additional metadata directories for git\-svn\&. The Subversion URL must be specified as a command\-line argument\&. - +Creates an empty git repository with additional metadata directories for git\-svn. The Subversion URL must be specified as a command\-line argument. .TP \fIfetch\fR -Fetch unfetched revisions from the Subversion URL we are tracking\&. refs/remotes/git\-svn will be updated to the latest revision\&. - -Note: You should never attempt to modify the remotes/git\-svn branch outside of git\-svn\&. Instead, create a branch from remotes/git\-svn and work on that branch\&. Use the \fIcommit\fR command (see below) to write git commits back to remotes/git\-svn\&. - -See \fIAdditional Fetch Arguments\fR if you are interested in manually joining branches on commit\&. - +Fetch unfetched revisions from the Subversion URL we are tracking. refs/remotes/git\-svn will be updated to the latest revision. +.sp +Note: You should never attempt to modify the remotes/git\-svn branch outside of git\-svn. Instead, create a branch from remotes/git\-svn and work on that branch. Use the +\fIcommit\fR +command (see below) to write git commits back to remotes/git\-svn. +.sp +See +\fIAdditional Fetch Arguments\fR +if you are interested in manually joining branches on commit. .TP \fIdcommit\fR -Commit all diffs from the current HEAD directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and HEAD)\&. It is recommended that you run git\-svn fetch and rebase (not pull) your commits against the latest changes in the SVN repository\&. This is advantageous over \fIcommit\fR (below) because it produces cleaner, more linear history\&. - +Commit all diffs from the current HEAD directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and HEAD). It is recommended that you run git\-svn fetch and rebase (not pull) your commits against the latest changes in the SVN repository. This is advantageous over +\fIcommit\fR +(below) because it produces cleaner, more linear history. .TP \fIcommit\fR -Commit specified commit or tree objects to SVN\&. This relies on your imported fetch data being up\-to\-date\&. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit\&. All merging is assumed to have taken place independently of git\-svn functions\&. - +Commit specified commit or tree objects to SVN. This relies on your imported fetch data being up\-to\-date. This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit. All merging is assumed to have taken place independently of git\-svn functions. .TP \fIrebuild\fR -Not a part of daily usage, but this is a useful command if you've just cloned a repository (using \fBgit\-clone\fR(1)) that was tracked with git\-svn\&. Unfortunately, git\-clone does not clone git\-svn metadata and the svn working tree that git\-svn uses for its operations\&. This rebuilds the metadata so git\-svn can resume fetch operations\&. A Subversion URL may be optionally specified at the command\-line if the directory/repository you're tracking has moved or changed protocols\&. - +Not a part of daily usage, but this is a useful command if you've just cloned a repository (using +\fBgit\-clone\fR(1)) that was tracked with git\-svn. Unfortunately, git\-clone does not clone git\-svn metadata and the svn working tree that git\-svn uses for its operations. This rebuilds the metadata so git\-svn can resume fetch operations. A Subversion URL may be optionally specified at the command\-line if the directory/repository you're tracking has moved or changed protocols. .TP \fIshow\-ignore\fR -Recursively finds and lists the svn:ignore property on directories\&. The output is suitable for appending to the $GIT_DIR/info/exclude file\&. - +Recursively finds and lists the svn:ignore property on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file. .SH "OPTIONS" - .TP -\-r , \-\-revision -Only used with the \fIfetch\fR command\&. - -Takes any valid \-r svn would accept and passes it directly to svn\&. \-r: ranges and "{" DATE "}" syntax is also supported\&. This is passed directly to svn, see svn documentation for more details\&. - -This can allow you to make partial mirrors when running fetch\&. - +\-r , \-\-revision +Only used with the +\fIfetch\fR +command. +.sp +Takes any valid \-r svn would accept and passes it directly to svn. \-r: ranges and "{" DATE "}" syntax is also supported. This is passed directly to svn, see svn documentation for more details. +.sp +This can allow you to make partial mirrors when running fetch. .TP -\-, \-\-stdin -Only used with the \fIcommit\fR command\&. - -Read a list of commits from stdin and commit them in reverse order\&. Only the leading sha1 is read from each line, so git\-rev\-list \-\-pretty=oneline output can be used\&. - +\- , \-\-stdin +Only used with the +\fIcommit\fR +command. +.sp +Read a list of commits from stdin and commit them in reverse order. Only the leading sha1 is read from each line, so git\-rev\-list \-\-pretty=oneline output can be used. .TP \-\-rmdir -Only used with the \fIcommit\fR command\&. - -Remove directories from the SVN tree if there are no files left behind\&. SVN can version empty directories, and they are not removed by default if there are no files left in them\&. git cannot version empty directories\&. Enabling this flag will make the commit to SVN act like git\&. - -repo\-config key: svn\&.rmdir - +Only used with the +\fIcommit\fR +command. +.sp +Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not removed by default if there are no files left in them. git cannot version empty directories. Enabling this flag will make the commit to SVN act like git. +.sp +repo\-config key: svn.rmdir .TP -\-e, \-\-edit -Only used with the \fIcommit\fR command\&. - -Edit the commit message before committing to SVN\&. This is off by default for objects that are commits, and forced on when committing tree objects\&. - -repo\-config key: svn\&.edit - +\-e , \-\-edit +Only used with the +\fIcommit\fR +command. +.sp +Edit the commit message before committing to SVN. This is off by default for objects that are commits, and forced on when committing tree objects. +.sp +repo\-config key: svn.edit .TP -\-l, \-\-find\-copies\-harder -Both of these are only used with the \fIcommit\fR command\&. - -They are both passed directly to git\-diff\-tree see \fBgit\-diff\-tree\fR(1) for more information\&. - +\-l , \-\-find\-copies\-harder +Both of these are only used with the +\fIcommit\fR +command. +.sp +They are both passed directly to git\-diff\-tree see +\fBgit\-diff\-tree\fR(1) +for more information. +.sp .nf -repo\-config key: svn\&.l -repo\-config key: svn\&.findcopiesharder +repo\-config key: svn.l +repo\-config key: svn.findcopiesharder .fi - .TP -\-A, \-\-authors\-file= +\-A , \-\-authors\-file= Syntax is compatible with the files used by git\-svnimport and git\-cvsimport: - - +.sp .nf - loginname = Joe User + loginname = Joe User .fi -If this option is specified and git\-svn encounters an SVN committer name that does not exist in the authors\-file, git\-svn will abort operation\&. The user will then have to add the appropriate entry\&. Re\-running the previous git\-svn command after the authors\-file is modified should continue operation\&. - -repo\-config key: svn\&.authors\-file - +If this option is specified and git\-svn encounters an SVN committer name that does not exist in the authors\-file, git\-svn will abort operation. The user will then have to add the appropriate entry. Re\-running the previous git\-svn command after the authors\-file is modified should continue operation. +.sp +repo\-config key: svn.authors\-file .TP -\-m, \-\-merge, \-s, \-\-strategy= -These are only used with the \fIdcommit\fR command\&. - -Passed directly to git\-rebase when using \fIdcommit\fR if a \fIgit\-reset\fR cannot be used (see dcommit)\&. - +\-m , \-\-merge , \-s , \-\-strategy= +These are only used with the +\fIdcommit\fR +command. +.sp +Passed directly to git\-rebase when using +\fIdcommit\fR +if a +\fIgit\-reset\fR +cannot be used (see dcommit). .TP -\-n, \-\-dry\-run -This is only used with the \fIdcommit\fR command\&. - -Print out the series of git arguments that would show which diffs would be committed to SVN\&. - +\-n , \-\-dry\-run +This is only used with the +\fIdcommit\fR +command. +.sp +Print out the series of git arguments that would show which diffs would be committed to SVN. .SH "ADVANCED OPTIONS" - .TP -\-b, \-\-branch -Used with \fIfetch\fR or \fIcommit\fR\&. - -This can be used to join arbitrary git branches to remotes/git\-svn on new commits where the tree object is equivalent\&. - -When used with different GIT_SVN_ID values, tags and branches in SVN can be tracked this way, as can some merges where the heads end up having completely equivalent content\&. This can even be used to track branches across multiple SVN _repositories_\&. - -This option may be specified multiple times, once for each branch\&. - -repo\-config key: svn\&.branch - +\-b , \-\-branch +Used with +\fIfetch\fR +or +\fIcommit\fR. +.sp +This can be used to join arbitrary git branches to remotes/git\-svn on new commits where the tree object is equivalent. +.sp +When used with different GIT_SVN_ID values, tags and branches in SVN can be tracked this way, as can some merges where the heads end up having completely equivalent content. This can even be used to track branches across multiple SVN _repositories_. +.sp +This option may be specified multiple times, once for each branch. +.sp +repo\-config key: svn.branch .TP -\-i, \-\-id -This sets GIT_SVN_ID (instead of using the environment)\&. See the section on \fITracking Multiple Repositories or Branches\fR for more information on using GIT_SVN_ID\&. - +\-i , \-\-id +This sets GIT_SVN_ID (instead of using the environment). See the section on +\fITracking Multiple Repositories or Branches\fR +for more information on using GIT_SVN_ID. .SH "COMPATIBILITY OPTIONS" - .TP \-\-upgrade -Only used with the \fIrebuild\fR command\&. - -Run this if you used an old version of git\-svn that used "git\-svn\-HEAD" instead of "remotes/git\-svn" as the branch for tracking the remote\&. - +Only used with the +\fIrebuild\fR +command. +.sp +Run this if you used an old version of git\-svn that used "git\-svn\-HEAD" instead of "remotes/git\-svn" as the branch for tracking the remote. .TP \-\-no\-ignore\-externals -Only used with the \fIfetch\fR and \fIrebuild\fR command\&. - -By default, git\-svn passes \-\-ignore\-externals to svn to avoid fetching svn:external trees into git\&. Pass this flag to enable externals tracking directly via git\&. - -Versions of svn that do not support \-\-ignore\-externals are automatically detected and this flag will be automatically enabled for them\&. - -Otherwise, do not enable this flag unless you know what you're doing\&. - -repo\-config key: svn\&.noignoreexternals - +Only used with the +\fIfetch\fR +and +\fIrebuild\fR +command. +.sp +By default, git\-svn passes \-\-ignore\-externals to svn to avoid fetching svn:external trees into git. Pass this flag to enable externals tracking directly via git. +.sp +Versions of svn that do not support \-\-ignore\-externals are automatically detected and this flag will be automatically enabled for them. +.sp +Otherwise, do not enable this flag unless you know what you're doing. +.sp +repo\-config key: svn.noignoreexternals +.TP +\-\-ignore\-nodate +Only used with the +\fIfetch\fR +command. +.sp +By default git\-svn will crash if it tries to import a revision from SVN which has +\fI(no date)\fR +listed as the date of the revision. This is repository corruption on SVN's part, plain and simple. But sometimes you really need those revisions anyway. +.sp +If supplied git\-svn will convert +\fI(no date)\fR +entries to the UNIX epoch (midnight on Jan. 1, 1970). Yes, that's probably very wrong. SVN was very wrong. .SS "Basic Examples" - - Tracking and contributing to an Subversion managed\-project: - +.sp +.sp .nf # Initialize a tree (like git init\-db): - git\-svn init http://svn\&.foo\&.org/project/trunk + git\-svn init http://svn.foo.org/project/trunk # Fetch remote revisions: git\-svn fetch # Create your own branch to hack on: git checkout \-b my\-branch remotes/git\-svn # Commit only the git commits you want to SVN: - git\-svn commit [ \&.\&.\&.] + git\-svn commit [ ...] # Commit all the git commits from my\-branch that don't exist in SVN: - git\-svn commit remotes/git\-svn\&.\&.my\-branch + git\-svn commit remotes/git\-svn..my\-branch # Something is committed to SVN, rebase the latest into your branch: git\-svn fetch && git rebase remotes/git\-svn # Append svn:ignore settings to the default git exclude file: - git\-svn show\-ignore >> \&.git/info/exclude + git\-svn show\-ignore >> .git/info/exclude .fi - .SH "REBASE VS. PULL" - - -Originally, git\-svn recommended that the remotes/git\-svn branch be pulled from\&. This is because the author favored \fIgit\-svn commit B\fR to commit a single head rather than the \fIgit\-svn commit A\&.\&.B\fR notation to commit multiple commits\&. - - -If you use \fIgit\-svn commit A\&.\&.B\fR to commit several diffs and you do not have the latest remotes/git\-svn merged into my\-branch, you should use \fIgit rebase\fR to update your work branch instead of \fIgit pull\fR\&. \fIpull\fR can cause non\-linear history to be flattened when committing into SVN, which can lead to merge commits reversing previous commits in SVN\&. - +Originally, git\-svn recommended that the remotes/git\-svn branch be pulled from. This is because the author favored \fIgit\-svn commit B\fR to commit a single head rather than the \fIgit\-svn commit A..B\fR notation to commit multiple commits. +.sp +If you use \fIgit\-svn commit A..B\fR to commit several diffs and you do not have the latest remotes/git\-svn merged into my\-branch, you should use \fIgit rebase\fR to update your work branch instead of \fIgit pull\fR. \fIpull\fR can cause non\-linear history to be flattened when committing into SVN, which can lead to merge commits reversing previous commits in SVN. +.sp .SH "DESIGN PHILOSOPHY" - - -Merge tracking in Subversion is lacking and doing branched development with Subversion is cumbersome as a result\&. git\-svn completely forgoes any automated merge/branch tracking on the Subversion side and leaves it entirely up to the user on the git side\&. It's simply not worth it to do a useful translation when the original signal is weak\&. - +Merge tracking in Subversion is lacking and doing branched development with Subversion is cumbersome as a result. git\-svn completely forgoes any automated merge/branch tracking on the Subversion side and leaves it entirely up to the user on the git side. It's simply not worth it to do a useful translation when the original signal is weak. +.sp .SH "TRACKING MULTIPLE REPOSITORIES OR BRANCHES" - - -This is for advanced users, most users should ignore this section\&. - - -Because git\-svn does not care about relationships between different branches or directories in a Subversion repository, git\-svn has a simple hack to allow it to track an arbitrary number of related _or_ unrelated SVN repositories via one git repository\&. Simply set the GIT_SVN_ID environment variable to a name other other than "git\-svn" (the default) and git\-svn will ignore the contents of the $GIT_DIR/git\-svn directory and instead do all of its work in $GIT_DIR/$GIT_SVN_ID for that invocation\&. The interface branch will be remotes/$GIT_SVN_ID, instead of remotes/git\-svn\&. Any remotes/$GIT_SVN_ID branch should never be modified by the user outside of git\-svn commands\&. - +This is for advanced users, most users should ignore this section. +.sp +Because git\-svn does not care about relationships between different branches or directories in a Subversion repository, git\-svn has a simple hack to allow it to track an arbitrary number of related _or_ unrelated SVN repositories via one git repository. Simply set the GIT_SVN_ID environment variable to a name other other than "git\-svn" (the default) and git\-svn will ignore the contents of the $GIT_DIR/git\-svn directory and instead do all of its work in $GIT_DIR/$GIT_SVN_ID for that invocation. The interface branch will be remotes/$GIT_SVN_ID, instead of remotes/git\-svn. Any remotes/$GIT_SVN_ID branch should never be modified by the user outside of git\-svn commands. +.sp .SH "ADDITIONAL FETCH ARGUMENTS" - - -This is for advanced users, most users should ignore this section\&. - - -Unfetched SVN revisions may be imported as children of existing commits by specifying additional arguments to \fIfetch\fR\&. Additional parents may optionally be specified in the form of sha1 hex sums at the command\-line\&. Unfetched SVN revisions may also be tied to particular git commits with the following syntax: - +This is for advanced users, most users should ignore this section. +.sp +Unfetched SVN revisions may be imported as children of existing commits by specifying additional arguments to \fIfetch\fR. Additional parents may optionally be specified in the form of sha1 hex sums at the command\-line. Unfetched SVN revisions may also be tied to particular git commits with the following syntax: +.sp +.sp .nf svn_revision_number=git_commit_sha1 .fi - - This allows you to tie unfetched SVN revision 375 to your current HEAD: - +.sp +.sp .nf git\-svn fetch 375=$(git\-rev\-parse HEAD) .fi - .SS "Advanced Example: Tracking a Reorganized Repository" - - -If you're tracking a directory that has moved, or otherwise been branched or tagged off of another directory in the repository and you care about the full history of the project, then you can read this section\&. - - -This is how Yann Dirson tracked the trunk of the ufoai directory when the /trunk directory of his repository was moved to /ufoai/trunk and he needed to continue tracking /ufoai/trunk where /trunk left off\&. - +If you're tracking a directory that has moved, or otherwise been branched or tagged off of another directory in the repository and you care about the full history of the project, then you can read this section. +.sp +This is how Yann Dirson tracked the trunk of the ufoai directory when the /trunk directory of his repository was moved to /ufoai/trunk and he needed to continue tracking /ufoai/trunk where /trunk left off. +.sp +.sp .nf # This log message shows when the repository was reorganized: r166 | ydirson | 2006\-03\-02 01:36:55 +0100 (Thu, 02 Mar 2006) | 1 line @@ -253,42 +247,30 @@ This is how Yann Dirson tracked the trunk of the ufoai directory when the /trunk # First we start tracking the old revisions: GIT_SVN_ID=git\-oldsvn git\-svn init \\ - https://svn\&.sourceforge\&.net/svnroot/ufoai/trunk + https://svn.sourceforge.net/svnroot/ufoai/trunk GIT_SVN_ID=git\-oldsvn git\-svn fetch \-r1:165 # And now, we continue tracking the new revisions: GIT_SVN_ID=git\-newsvn git\-svn init \\ - https://svn\&.sourceforge\&.net/svnroot/ufoai/ufoai/trunk + https://svn.sourceforge.net/svnroot/ufoai/ufoai/trunk GIT_SVN_ID=git\-newsvn git\-svn fetch \\ 166=`git\-rev\-parse refs/remotes/git\-oldsvn` .fi - .SH "BUGS" - - -If somebody commits a conflicting changeset to SVN at a bad moment (right before you commit) causing a conflict and your commit to fail, your svn working tree ($GIT_DIR/git\-svn/tree) may be dirtied\&. The easiest thing to do is probably just to rm \-rf $GIT_DIR/git\-svn/tree and run \fIrebuild\fR\&. - - -We ignore all SVN properties except svn:executable\&. Too difficult to map them since we rely heavily on git write\-tree being _exactly_ the same on both the SVN and git working trees and I prefer not to clutter working trees with metadata files\&. - - -svn:keywords can't be ignored in Subversion (at least I don't know of a way to ignore them)\&. - - -Renamed and copied directories are not detected by git and hence not tracked when committing to SVN\&. I do not plan on adding support for this as it's quite difficult and time\-consuming to get working for all the possible corner cases (git doesn't do it, either)\&. Renamed and copied files are fully supported if they're similar enough for git to detect them\&. - +If somebody commits a conflicting changeset to SVN at a bad moment (right before you commit) causing a conflict and your commit to fail, your svn working tree ($GIT_DIR/git\-svn/tree) may be dirtied. The easiest thing to do is probably just to rm \-rf $GIT_DIR/git\-svn/tree and run \fIrebuild\fR. +.sp +We ignore all SVN properties except svn:executable. Too difficult to map them since we rely heavily on git write\-tree being _exactly_ the same on both the SVN and git working trees and I prefer not to clutter working trees with metadata files. +.sp +svn:keywords can't be ignored in Subversion (at least I don't know of a way to ignore them). +.sp +Renamed and copied directories are not detected by git and hence not tracked when committing to SVN. I do not plan on adding support for this as it's quite difficult and time\-consuming to get working for all the possible corner cases (git doesn't do it, either). Renamed and copied files are fully supported if they're similar enough for git to detect them. +.sp .SH "SEE ALSO" - - \fBgit\-rebase\fR(1) - +.sp .SH "AUTHOR" - - -Written by Eric Wong \&. - +Written by Eric Wong . +.sp .SH "DOCUMENTATION" - - -Written by Eric Wong \&. - +Written by Eric Wong . +.sp diff --git a/man1/git-tar-tree.1 b/man1/git-tar-tree.1 index a73bf1de5..35faf6a9c 100755 --- a/man1/git-tar-tree.1 +++ b/man1/git-tar-tree.1 @@ -1,98 +1,69 @@ -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "GIT-TAR-TREE" 1 "" "" "" -.SH NAME -git-tar-tree \- Creates a tar archive of the files in the named tree +.\" ** 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 "GIT\-TAR\-TREE" "1" "09/25/2006" "" "" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +git\-tar\-tree \- Creates a tar archive of the files in the named tree .SH "SYNOPSIS" - - \fIgit\-tar\-tree\fR [\-\-remote=] [ ] - +.sp .SH "DESCRIPTION" - - -Creates a tar archive containing the tree structure for the named tree\&. When is specified it is added as a leading path to the files in the generated tar archive\&. - - -git\-tar\-tree behaves differently when given a tree ID versus when given a commit ID or tag ID\&. In the first case the current time is used as modification time of each file in the archive\&. In the latter case the commit time as recorded in the referenced commit object is used instead\&. Additionally the commit ID is stored in a global extended pax header\&. It can be extracted using git\-get\-tar\-commit\-id\&. - +THIS COMMAND IS DEPRECATED. Use git\-archive with \-\-format=tar option instead. +.sp +Creates a tar archive containing the tree structure for the named tree. When is specified it is added as a leading path to the files in the generated tar archive. +.sp +git\-tar\-tree behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header. It can be extracted using git\-get\-tar\-commit\-id. +.sp .SH "OPTIONS" - .TP -The tree or commit to produce tar archive for\&. If it is the object name of a commit object\&. - +The tree or commit to produce tar archive for. If it is the object name of a commit object. .TP -Leading path to the files in the resulting tar archive\&. - +Leading path to the files in the resulting tar archive. .TP \-\-remote= -Instead of making a tar archive from local repository, retrieve a tar archive from a remote repository\&. - +Instead of making a tar archive from local repository, retrieve a tar archive from a remote repository. .SH "CONFIGURATION" - - -By default, file and directories modes are set to 0666 or 0777\&. It is possible to change this by setting the "umask" variable in the repository configuration as follows : - +By default, file and directories modes are set to 0666 or 0777. It is possible to change this by setting the "umask" variable in the repository configuration as follows : +.sp +.sp .nf umask = 002 ;# group friendly .fi - - -The special umask value "user" indicates that the user's current umask will be used instead\&. The default value remains 0, which means world readable/writable files and directories\&. - +The special umask value "user" indicates that the user's current umask will be used instead. The default value remains 0, which means world readable/writable files and directories. +.sp .SH "EXAMPLES" - .TP git tar\-tree HEAD junk | (cd /var/tmp/ && tar xf \-) -Create a tar archive that contains the contents of the latest commit on the current branch, and extracts it in /var/tmp/junk directory\&. - +Create a tar archive that contains the contents of the latest commit on the current branch, and extracts it in +/var/tmp/junk +directory. .TP -git tar\-tree v1\&.4\&.0 git\-1\&.4\&.0 | gzip >git\-1\&.4\&.0\&.tar\&.gz -Create a tarball for v1\&.4\&.0 release\&. - +git tar\-tree v1.4.0 git\-1.4.0 | gzip >git\-1.4.0.tar.gz +Create a tarball for v1.4.0 release. .TP -git tar\-tree v1\&.4\&.0^{tree} git\-1\&.4\&.0 | gzip >git\-1\&.4\&.0\&.tar\&.gz -Create a tarball for v1\&.4\&.0 release, but without a global extended pax header\&. - +git tar\-tree v1.4.0^{tree} git\-1.4.0 | gzip >git\-1.4.0.tar.gz +Create a tarball for v1.4.0 release, but without a global extended pax header. .TP -git tar\-tree \-\-remote=example\&.com:git\&.git v1\&.4\&.0 >git\-1\&.4\&.0\&.tar -Get a tarball v1\&.4\&.0 from example\&.com\&. - +git tar\-tree \-\-remote=example.com:git.git v1.4.0 >git\-1.4.0.tar +Get a tarball v1.4.0 from example.com. .TP -git tar\-tree HEAD:Documentation/ git\-docs > git\-1\&.4\&.0\-docs\&.tar -Put everything in the current head's Documentation/ directory into \fIgit\-1\&.4\&.0\-docs\&.tar\fR, with the prefix \fIgit\-docs/\fR\&. - +git tar\-tree HEAD:Documentation/ git\-docs > git\-1.4.0\-docs.tar +Put everything in the current head's Documentation/ directory into +\fIgit\-1.4.0\-docs.tar\fR, with the prefix +\fIgit\-docs/\fR. .SH "AUTHOR" - - -Written by Rene Scharfe\&. - +Written by Rene Scharfe. +.sp .SH "DOCUMENTATION" - - -Documentation by David Greaves, Junio C Hamano and the git\-list \&. - +Documentation by David Greaves, Junio C Hamano and the git\-list . +.sp .SH "GIT" - - Part of the \fBgit\fR(7) suite - +.sp diff --git a/man1/git-upload-tar.1 b/man1/git-upload-tar.1 deleted file mode 100755 index d3d3523aa..000000000 --- a/man1/git-upload-tar.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "GIT-UPLOAD-TAR" 1 "" "" "" -.SH NAME -git-upload-tar \- Send tar archive -.SH "SYNOPSIS" - - -\fIgit\-upload\-tar\fR - -.SH "DESCRIPTION" - - -Invoked by \fIgit\-tar\-tree \-\-remote\fR and sends a generated tar archive to the other end over the git protocol\&. - - -This command is usually not invoked directly by the end user\&. The UI for the protocol is on the \fIgit\-tar\-tree\fR side, and the program pair is meant to be used to get a tar archive from a remote repository\&. - -.SH "OPTIONS" - -.TP - -The repository to get a tar archive from\&. - -.SH "AUTHOR" - - -Written by Junio C Hamano - -.SH "DOCUMENTATION" - - -Documentation by Junio C Hamano\&. - -.SH "GIT" - - -Part of the \fBgit\fR(7) suite - diff --git a/man7/git.7 b/man7/git.7 index e66ec50cd..cf0a4adf1 100755 --- a/man7/git.7 +++ b/man7/git.7 @@ -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" "7" "09/04/2006" "" "" +.TH "GIT" "7" "09/25/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -213,11 +213,6 @@ Updates auxiliary information on a dumb server to help clients discover referenc Invoked by \fIgit\-fetch\-pack\fR to push what are asked for. -.TP -\fBgit\-upload\-tar\fR(1) -Invoked by -\fIgit\-tar\-tree \-\-remote\fR -to return the tar archive the other end asked for. .SH "HIGH\-LEVEL COMMANDS (PORCELAIN)" We separate the porcelain commands into the main commands and some ancillary user utilities. .sp