From e27cbd23f20512f381606e2b437bfe80c681aa93 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 21 Dec 2007 17:57:33 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4-rc1-11-gd2f82 --- RelNotes-1.5.4.txt | 37 ++++++++++++++++++++----------------- diff-options.txt | 9 +++++++++ everyday.html | 31 +++++++------------------------ everyday.txt | 19 ++++++------------- git-diff-files.html | 26 +++++++++++++++++++++++++- git-diff-index.html | 26 +++++++++++++++++++++++++- git-diff-tree.html | 26 +++++++++++++++++++++++++- git-diff.html | 26 +++++++++++++++++++++++++- git-format-patch.html | 26 +++++++++++++++++++++++++- git-log.html | 26 +++++++++++++++++++++++++- 10 files changed, 192 insertions(+), 60 deletions(-) diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt index cd7912495..528b26f7c 100644 --- a/RelNotes-1.5.4.txt +++ b/RelNotes-1.5.4.txt @@ -14,28 +14,28 @@ Removal Deprecation notices ------------------- - * Next feature release of git (this change is scheduled for v1.6.0) + * The next feature release of git (this change is scheduled for v1.6.0) will by default install dashed form of commands (e.g. "git-commit") outside of users' normal $PATH, and will install only selected commands ("git" itself, and "gitk") in $PATH. This implies: - - Using dashed form of git commands (e.g. "git-commit") from the + - Using dashed forms of git commands (e.g. "git-commit") from the command line has been informally deprecated since early 2006, but now it officially is, and will be removed in the future. Use - dashless form (e.g. "git commit") instead. + dashless forms (e.g. "git commit") instead. - - Using dashed from from your scripts, without first prepending the + - Using dashed forms from your scripts, without first prepending the return value from "git --exec-path" to the scripts' PATH, has been informally deprecated since early 2006, but now it officially is. - - Use of dashed form with "PATH=$(git --exec-path):$PATH; export + - Use of dashed forms with "PATH=$(git --exec-path):$PATH; export PATH" early in your script is not deprecated with this change. Users are strongly encouraged to adjust their habits and scripts now to prepare for this. * The post-receive hook was introduced in March 2007 to supersede - post-update hook, primarily to overcome the command line length + the post-update hook, primarily to overcome the command line length limitation of the latter. Use of post-update hook will be deprecated in future versions of git, starting from v1.6.0. @@ -43,10 +43,11 @@ Deprecation notices option, and will be removed in the future. * "git peek-remote" is deprecated, as "git ls-remote" was written in C - and works for all transports, and will be removed in the future. + and works for all transports; "git peek-remote" will be removed in + the future. * From v1.6.0, the repack.usedeltabaseoffset config option will default - to true, which will give denser packfile (i.e. more efficient storage). + to true, which will give denser packfiles (i.e. more efficient storage). The downside is that git older than version 1.4.4 will not be able to directly use a repository packed using this setting. @@ -67,7 +68,7 @@ Updates since v1.5.3 * gitk is now merged as a subdirectory of git.git project, in preparation for its i18n. - * progress display from many commands are a lot nicer to the eye. + * progress displays from many commands are a lot nicer to the eye. Transfer commands show throughput data. * many commands that pay attention to per-directory .gitignore now do @@ -76,12 +77,12 @@ Updates since v1.5.3 * Output processing for '--pretty=format:' has been optimized. - * Rename detection of diff family, while detecting exact matches, has + * Rename detection of diff family while detecting exact matches has been greatly optimized. - * Rename detection of diff family tries to make more naturally looking - pairing. Earlier if more than one identical rename sources were - found in the preimage, they were picked pretty much at random. + * Rename detection of diff family tries to make more natural looking + pairing. Earlier, if multiple identical rename sources were + found in the preimage, the source used was picked pretty much at random. * Value "true" for color.diff and color.status configuration used to mean "always" (even when the output is not going to a terminal). @@ -114,7 +115,7 @@ Updates since v1.5.3 * "git rebase --interactive" mode can now work on detached HEAD. - * Other minor to serious bugs in "git rebase -i" has been fixed. + * Other minor to serious bugs in "git rebase -i" have been fixed. * "git rebase" now detaches head during its operation, so after a successful "git rebase" operation, the reflog entry branch@{1} for @@ -175,7 +176,9 @@ Updates since v1.5.3 * "git remote" learned "rm" subcommand. - * "git cvsserver" can be run via "git shell". + * "git cvsserver" can be run via "git shell". Also, "cvs" is + recognized as a synonym for "git cvsserver", so that CVS users + can be switched to git just by changing their login shell. * "git cvsserver" acts more like receive-pack by running post-receive and post-update hooks. @@ -245,7 +248,7 @@ Updates since v1.5.3 * The format "git show" outputs an annotated tag has been updated to include "Tagger: " and "Date: " lines from the tag itself. Strictly speaking this is a backward incompatible change, but this is a - reasonable usability fix and people's script shouldn't have been + reasonable usability fix and people's scripts shouldn't have been relying on the exact output from "git show" Porcelain anyway. * "git cvsexportcommit" learned -w option to specify and switch to the @@ -281,7 +284,7 @@ Updates since v1.5.3 makes copy-and-pasting for git-checkout/git-add/git-rm easier. The traditional behaviour to show the full path relative to the top of the work tree can be had by setting status.relativepaths - configuration variable to true. + configuration variable to false. * "git blame" kept text for each annotated revision in core needlessly; this has been corrected. diff --git a/diff-options.txt b/diff-options.txt index 9ecc1d7bc..1a78635fb 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -211,5 +211,14 @@ endif::git-format-patch[] --no-ext-diff:: Disallow external diff drivers. +--src-prefix=:: + Show the given source prefix instead of "a/". + +--dst-prefix=:: + Show the given destination prefix instead of "b/". + +--no-prefix:: + Do not show any source or destination prefix. + For more detailed explanation on these common options, see also link:diffcore.html[diffcore documentation]. diff --git a/everyday.html b/everyday.html index 6925ff047..3b922a7dd 100644 --- a/everyday.html +++ b/everyday.html @@ -295,16 +295,6 @@ of git repositories.

  • -git-prune(1) to remove unused objects in the repository. -

    -
    • -
  • -

    -git-repack(1) to pack loose objects for efficiency. -

    -
    • -
  • -

    git-gc(1) to do common housekeeping tasks such as repack and prune.

    @@ -320,8 +310,7 @@ Check health and remove cruft. 
    $ git fsck (1)
 $ git count-objects (2)
-$ git repack (3)
-$ git gc (4)
    +$ git gc (3)
    1. @@ -338,14 +327,8 @@ disk space is wasted by not repacking.

    2. -without -a repacks incrementally. repacking every 4-5MB -of loose objects accumulation may be a good rule of thumb. -

      -
      3. -
    3. -

      -it is easier to use git gc than individual housekeeping commands -such as prune and repack. This runs repack -a -d. +repacks the local repository and performs other housekeeping tasks. Running +without —prune is a safe operation even while other ones are in progress.

    @@ -356,8 +339,8 @@ Repack a small project into single pack.
    -
    $ git repack -a -d (1)
-$ git prune
    +
    $ git gc (1)
+$ git gc --prune
    1. @@ -598,7 +581,7 @@ $ git pull (3) $ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 (4) $ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL (5) $ git reset --hard ORIG_HEAD (6) -$ git prune (7) +$ git gc --prune (7) $ git fetch --tags (8)
        @@ -1069,7 +1052,7 @@ upload to public HTTP server hosted by your ISP. diff --git a/everyday.txt b/everyday.txt index ce7c170d6..f1993e293 100644 --- a/everyday.txt +++ b/everyday.txt @@ -30,10 +30,6 @@ Everybody uses these commands to maintain git repositories. * gitlink:git-fsck[1] to check the repository for errors. - * gitlink:git-prune[1] to remove unused objects in the repository. - - * gitlink:git-repack[1] to pack loose objects for efficiency. - * gitlink:git-gc[1] to do common housekeeping tasks such as repack and prune. @@ -45,24 +41,21 @@ Check health and remove cruft.:: ------------ $ git fsck <1> $ git count-objects <2> -$ git repack <3> -$ git gc <4> +$ git gc <3> ------------ + <1> running without `\--full` is usually cheap and assures the repository health reasonably well. <2> check how many loose objects there are and how much disk space is wasted by not repacking. -<3> without `-a` repacks incrementally. repacking every 4-5MB -of loose objects accumulation may be a good rule of thumb. -<4> it is easier to use `git gc` than individual housekeeping commands -such as `prune` and `repack`. This runs `repack -a -d`. +<3> repacks the local repository and performs other housekeeping tasks. Running +without `--prune` is a safe operation even while other ones are in progress. Repack a small project into single pack.:: + ------------ -$ git repack -a -d <1> -$ git prune +$ git gc <1> +$ git gc --prune ------------ + <1> pack all the objects reachable from the refs into one pack, @@ -189,7 +182,7 @@ $ git pull <3> $ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <4> $ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL <5> $ git reset --hard ORIG_HEAD <6> -$ git prune <7> +$ git gc --prune <7> $ git fetch --tags <8> ------------ + diff --git a/git-diff-files.html b/git-diff-files.html index 2a1b53dc1..1a415825e 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -696,6 +696,30 @@ same as "git-diff-index" and "git-diff-tree".

        Disallow external diff drivers.

    +
    +--src-prefix=<prefix> +
    +
    +

    + Show the given source prefix instead of "a/". +

    +
    +
    +--dst-prefix=<prefix> +
    +
    +

    + Show the given destination prefix instead of "b/". +

    +
    +
    +--no-prefix +
    +
    +

    + Do not show any source or destination prefix. +

    +

    For more detailed explanation on these common options, see also diffcore documentation.

    @@ -1237,7 +1261,7 @@ the pathname, but if that is NUL, the record will show two paths.

    diff --git a/git-diff-index.html b/git-diff-index.html index 01e0d3fb0..c09641c4d 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -697,6 +697,30 @@ entries in the index are compared.

    Disallow external diff drivers.

    +
    +--src-prefix=<prefix> +
    +
    +

    + Show the given source prefix instead of "a/". +

    +
    +
    +--dst-prefix=<prefix> +
    +
    +

    + Show the given destination prefix instead of "b/". +

    +
    +
    +--no-prefix +
    +
    +

    + Do not show any source or destination prefix. +

    +

    For more detailed explanation on these common options, see also diffcore documentation.

    @@ -1319,7 +1343,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index 45a07b9e7..b36b00ea1 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -699,6 +699,30 @@ git-diff-tree(1) Manual Page Disallow external diff drivers.

    +
    +--src-prefix=<prefix> +
    +
    +

    + Show the given source prefix instead of "a/". +

    +
    +
    +--dst-prefix=<prefix> +
    +
    +

    + Show the given destination prefix instead of "b/". +

    +
    +
    +--no-prefix +
    +
    +

    + Do not show any source or destination prefix. +

    +

    For more detailed explanation on these common options, see also diffcore documentation.

    @@ -1707,7 +1731,7 @@ the pathname, but if that is NUL, the record will show two paths.

    diff --git a/git-diff.html b/git-diff.html index de3151fd0..a100b957d 100644 --- a/git-diff.html +++ b/git-diff.html @@ -775,6 +775,30 @@ and the range notations ("<commit>..<commit>" and Disallow external diff drivers.

    +
    +--src-prefix=<prefix> +
    +
    +

    + Show the given source prefix instead of "a/". +

    +
    +
    +--dst-prefix=<prefix> +
    +
    +

    + Show the given destination prefix instead of "b/". +

    +
    +
    +--no-prefix +
    +
    +

    + Do not show any source or destination prefix. +

    +

    For more detailed explanation on these common options, see also diffcore documentation.

    @@ -1434,7 +1458,7 @@ Output diff in reverse. diff --git a/git-format-patch.html b/git-format-patch.html index a7732ffd5..8ee736768 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -743,6 +743,30 @@ reference.

    Disallow external diff drivers.

    +
    +--src-prefix=<prefix> +
    +
    +

    + Show the given source prefix instead of "a/". +

    +
    +
    +--dst-prefix=<prefix> +
    +
    +

    + Show the given destination prefix instead of "b/". +

    +
    +
    +--no-prefix +
    +
    +

    + Do not show any source or destination prefix. +

    +

    For more detailed explanation on these common options, see also diffcore documentation.

    @@ -993,7 +1017,7 @@ git-format-patch -3 diff --git a/git-log.html b/git-log.html index 02f89d0dd..762e8f86a 100644 --- a/git-log.html +++ b/git-log.html @@ -736,6 +736,30 @@ people using 80-column terminals.

    Disallow external diff drivers.

    +
    +--src-prefix=<prefix> +
    +
    +

    + Show the given source prefix instead of "a/". +

    +
    +
    +--dst-prefix=<prefix> +
    +
    +

    + Show the given destination prefix instead of "b/". +

    +
    +
    +--no-prefix +
    +
    +

    + Do not show any source or destination prefix. +

    +

    For more detailed explanation on these common options, see also diffcore documentation.

    @@ -1449,7 +1473,7 @@ reversible operation.

    -- 2.26.2