From: Junio C Hamano Date: Tue, 29 May 2007 09:18:19 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2-136-g322bc X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=591dc6ae2b927354f3011bedf81ae623d9014627;p=git.git Autogenerated HTML docs for v1.5.2-136-g322bc --- diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index 8e1af0980..503382387 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -272,7 +272,7 @@ git-cvsexportcommit(1) Manual Page

SYNOPSIS

-

git-cvsexportcommit [-h] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

+

git-cvsexportcommit [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

DESCRIPTION

@@ -353,6 +353,14 @@ should the changeset be done against.

+-u +
+
+

+ Update affected files from cvs repository before attempting export. +

+
+
-v
@@ -404,7 +412,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index fd7f54093..da5c24224 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -8,7 +8,7 @@ git-cvsexportcommit - Export a single commit to a CVS checkout SYNOPSIS -------- -'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID +'git-cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID DESCRIPTION @@ -58,6 +58,9 @@ OPTIONS Prepend the commit message with the provided prefix. Useful for patch series and the like. +-u:: + Update affected files from cvs repository before attempting export. + -v:: Verbose. diff --git a/git-cvsserver.html b/git-cvsserver.html index 576bdb952..13581ca3b 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -307,16 +307,27 @@ If you are going to offer anonymous CVS access via pserver, add a line in 
   cvspserver stream tcp nowait nobody git-cvsserver pserver
-

Note: In some cases, you need to pass the pserver argument twice for -git-cvsserver to see it. So the line would look like

+

Note: Some inetd servers let you specify the name of the executable +independently of the value of argv[0] (i.e. the name the program assumes +it was executed with). In this case the correct line in /etc/inetd.conf +looks like

-
   cvspserver stream tcp nowait nobody git-cvsserver pserver pserver
+
   cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver

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 -env variable, you can rename git-cvsserver to cvs.

+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

+
+
+
cvs -d ":ext;CVS_SERVER=git-cvsserver:user@server/path/repo.git" co <HEAD_name>
+
+

This has the advantage that it will be saved in your CVS/Root files and +you don't need to worry about always setting the correct environment +variable.

  • @@ -335,7 +346,7 @@ For each repo that you want accessible from CVS you need to edit config in write access to the log file and to the database (see Database Backend. If you want to offer write access over SSH, the users of course also need write access to the git repository itself.

    -

    All configuration variables can also be overriden for a specific method of +

    All configuration variables can also be overridden for a specific method of access. Valid method names are "ext" (for SSH access) and "pserver". The following example configuration would disable pserver access while still allowing access over SSH.

    @@ -384,7 +395,7 @@ Clients should now be able to check out the project. Use the CVS module

    git-cvsserver uses one database per git head (i.e. CVS module) to store information about the repository for faster access. The -database doesn't contain any persitent data and can be completly +database doesn't contain any persistent data and can be completely regenerated from the git repository at any time. The database needs to be updated (i.e. written to) after every commit.

    If the commit is done directly by using git (as opposed to @@ -613,7 +624,7 @@ Martin Langhoff <martin@catalyst.net.nz>

    diff --git a/git-cvsserver.txt b/git-cvsserver.txt index d22844ba4..e5005f02f 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -46,16 +46,28 @@ INSTALLATION cvspserver stream tcp nowait nobody git-cvsserver pserver ------ -Note: In some cases, you need to pass the 'pserver' argument twice for -git-cvsserver to see it. So the line would look like +Note: Some inetd servers let you specify the name of the executable +independently of the value of argv[0] (i.e. the name the program assumes +it was executed with). In this case the correct line in /etc/inetd.conf +looks like ------ - cvspserver stream tcp nowait nobody git-cvsserver pserver pserver + cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver ------ 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 -env variable, you can rename git-cvsserver to cvs. +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 + +------ +cvs -d ":ext;CVS_SERVER=git-cvsserver:user@server/path/repo.git" co +------ +This has the advantage that it will be saved in your 'CVS/Root' files and +you don't need to worry about always setting the correct environment +variable. -- 2. For each repo that you want accessible from CVS you need to edit config in the repo and add the following section. @@ -74,7 +86,7 @@ write access to the log file and to the database (see SSH, the users of course also need write access to the git repository itself. [[configaccessmethod]] -All configuration variables can also be overriden for a specific method of +All configuration variables can also be overridden for a specific method of access. Valid method names are "ext" (for SSH access) and "pserver". The following example configuration would disable pserver access while still allowing access over SSH. @@ -116,7 +128,7 @@ Database Backend git-cvsserver uses one database per git head (i.e. CVS module) to store information about the repository for faster access. The -database doesn't contain any persitent data and can be completly +database doesn't contain any persistent data and can be completely regenerated from the git repository at any time. The database needs to be updated (i.e. written to) after every commit. diff --git a/git-merge.html b/git-merge.html index f41972ebb..f056cefc6 100644 --- a/git-merge.html +++ b/git-merge.html @@ -273,7 +273,7 @@ git-merge(1) Manual Page

    SYNOPSIS

    -
    git-merge [-n] [--no-commit] [--squash] [-s <strategy>]… +
    git-merge [-n] [--summary] [--no-commit] [--squash] [-s <strategy>]… [-m <msg>] <remote> <remote>…

    DESCRIPTION

    @@ -285,6 +285,15 @@ which drives multiple merge strategy scripts.

    +--summary +
    +
    +

    + Show a diffstat at the end of the merge. The diffstat is also + controlled by the configuration option merge.diffstat. +

    +
    +
    -n, --no-summary
    @@ -570,7 +579,7 @@ Resolve the conflicts. git-diff would report only the
    diff --git a/git-merge.txt b/git-merge.txt index 9c08efa53..912ef29ef 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -9,7 +9,7 @@ git-merge - Join two or more development histories together SYNOPSIS -------- [verse] -'git-merge' [-n] [--no-commit] [--squash] [-s ]... +'git-merge' [-n] [--summary] [--no-commit] [--squash] [-s ]... [-m ] ... DESCRIPTION diff --git a/git-pack-objects.html b/git-pack-objects.html index 6af52ff9a..8579d4fbf 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -375,6 +375,16 @@ base-name

    +--max-pack-size=<n> +
    +
    +

    + Maximum size of each output packfile, expressed in MiB. + If specified, multiple packfiles may be created. + The default is unlimited. +

    +
    +
    --incremental
    @@ -528,7 +538,7 @@ base-name
    diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 2531238df..cfe127ad9 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -85,6 +85,11 @@ base-name:: times to get to the necessary object. The default value for --window is 10 and --depth is 50. +--max-pack-size=:: + Maximum size of each output packfile, expressed in MiB. + If specified, multiple packfiles may be created. + The default is unlimited. + --incremental:: This flag causes an object already in a pack ignored even if it appears in the standard input. diff --git a/git-pull.html b/git-pull.html index 50e706606..87c54b7ea 100644 --- a/git-pull.html +++ b/git-pull.html @@ -286,6 +286,15 @@ when merging local branches into the current branch.

    +--summary +
    +
    +

    + Show a diffstat at the end of the merge. The diffstat is also + controlled by the configuration option merge.diffstat. +

    +
    +
    -n, --no-summary
    @@ -887,7 +896,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

    diff --git a/git-repack.html b/git-repack.html index 9aecf8e4d..e3b12944f 100644 --- a/git-repack.html +++ b/git-repack.html @@ -361,6 +361,16 @@ engines, disk storage, etc.

    The default value for --window is 10 and --depth is 50.

    +
    +--max-pack-size=<n> +
    +
    +

    + Maximum size of each output packfile, expressed in MiB. + If specified, multiple packfiles may be created. + The default is unlimited. +

    +

    Configuration

    @@ -394,7 +404,7 @@ that way can try to use older git with it).

    diff --git a/git-repack.txt b/git-repack.txt index cc3b0b21c..2847c9b8d 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -65,6 +65,11 @@ OPTIONS to be applied that many times to get to the necessary object. The default value for --window is 10 and --depth is 50. +--max-pack-size=:: + Maximum size of each output packfile, expressed in MiB. + If specified, multiple packfiles may be created. + The default is unlimited. + Configuration ------------- diff --git a/merge-options.txt b/merge-options.txt index 182cef54b..56f1d8d69 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -1,3 +1,7 @@ +--summary:: + Show a diffstat at the end of the merge. The diffstat is also + controlled by the configuration option merge.diffstat. + -n, \--no-summary:: Do not show diffstat at the end of the merge. diff --git a/user-manual.html b/user-manual.html index b29829f57..97d16126a 100644 --- a/user-manual.html +++ b/user-manual.html @@ -369,7 +369,7 @@ refs/heads/tutorial-2
    refs/heads/tutorial-fixes

    And then we can ask to see all the commits reachable from master but not from these other heads:

    $ gitk master --not $( git show-ref --heads | cut -d' ' -f2 |
                                    grep -v '^refs/heads/master' )

    Obviously, endless variations are possible; for example, to see all -commits reachable from some head but not from any tag in the repository:

    $ gitk ($ git show-ref --heads ) --not  $( git show-ref --tags )

    (See git-rev-parse(1) for explanations of commit-selecting +commits reachable from some head but not from any tag in the repository:

    $ gitk $( git show-ref --heads ) --not  $( git show-ref --tags )

    (See git-rev-parse(1) for explanations of commit-selecting syntax such as —not.)

    Creating a changelog and tarball for a software release

    The git-archive(1) command can create a tar or zip archive from any version of a project; for example:

    $ git archive --format=tar --prefix=project/ HEAD | gzip >latest.tar.gz

    will use HEAD to produce a tar archive in which each filename is preceded by "prefix/".

    If you're releasing a new version of a software project, you may want diff --git a/user-manual.txt b/user-manual.txt index 52247aa71..4fabb8e2a 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -872,7 +872,7 @@ Obviously, endless variations are possible; for example, to see all commits reachable from some head but not from any tag in the repository: ------------------------------------------------- -$ gitk ($ git show-ref --heads ) --not $( git show-ref --tags ) +$ gitk $( git show-ref --heads ) --not $( git show-ref --tags ) ------------------------------------------------- (See gitlink:git-rev-parse[1] for explanations of commit-selecting