From b53db3ca58a8a65d8de3b9fa048d410757edc38f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 7 Aug 2008 00:17:52 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0-rc2 --- RelNotes-1.5.6.5.txt | 9 +++------ RelNotes-1.6.0.txt | 16 +++++++++++++++- git-diff-tree.html | 8 ++++---- git-diff-tree.txt | 6 +++--- git.html | 2 +- git.txt | 3 ++- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/RelNotes-1.5.6.5.txt b/RelNotes-1.5.6.5.txt index 23981acf3..47ca17246 100644 --- a/RelNotes-1.5.6.5.txt +++ b/RelNotes-1.5.6.5.txt @@ -6,6 +6,9 @@ Fixes since v1.5.6.4 * "git cvsimport" used to spit out "UNKNOWN LINE..." diagnostics to stdout. +* "git commit -F filename" and "git tag -F filename" run from subdirectories + did not read the right file. + * "git init --template=" with blank "template" parameter linked files under root directories to .git, which was a total nonsense. Instead, it means "I do not want to use anything from the template directory". @@ -24,9 +27,3 @@ Fixes since v1.5.6.4 header properly. Contains other various documentation fixes. - --- -exec >/var/tmp/1 -echo O=$(git describe maint) -O=v1.5.6.4-26-g2b6ca6d -git shortlog --no-merges $O..maint diff --git a/RelNotes-1.6.0.txt b/RelNotes-1.6.0.txt index 614a3be94..e524d80fb 100644 --- a/RelNotes-1.6.0.txt +++ b/RelNotes-1.6.0.txt @@ -142,6 +142,10 @@ Updates since v1.5.6 * git-archive uses the zlib default compression level when creating zip archive. +* git-archive's command line options --exec and --remote can take their + parameters as separate command line arguments, similar to other commands. + IOW, both "--exec=path" and "--exec path" are now supported. + * With -v option, git-branch describes the remote tracking statistics similar to the way git-checkout reports by how many commits your branch is ahead/behind. @@ -161,10 +165,16 @@ Updates since v1.5.6 * git-clone can clone from a remote whose URL would be rewritten by configuration stored in $HOME/.gitconfig now. +* "git-clone --mirror" is a handy way to set up a bare mirror repository. + * git-cvsserver learned to respond to "cvs co -c". * git-diff --check now checks leftover merge conflict markers. +* "git-diff -p" learned to grab a better hunk header lines in + Pascal/Delphi and Ruby source files, and also pays attention to + chapter and part boundary in TeX documents. + * When remote side used to have branch 'foo' and git-fetch finds that now it has branch 'foo/bar', it refuses to lose the existing remote tracking branch and its reflog. The error message has been improved to suggest @@ -176,6 +186,10 @@ Updates since v1.5.6 * fast-import and fast-export learned to export and import gitlinks. +* "gitk" left background process behind after begin asked to dig very deep + history and the user killed the UI; the process is killed when the UI goes + away now. + * git-rebase records the original tip of branch in ORIG_HEAD before it is rewound. @@ -234,6 +248,6 @@ this release, unless otherwise noted. --- exec >/var/tmp/1 -O=v1.6.0-rc0-104-g81dc230 +O=v1.6.0-rc1-113-gf44bc33 echo O=$(git describe refs/heads/master) git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-diff-tree.html b/git-diff-tree.html index 8cf9409ad..ebdcbd6af 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -862,13 +862,13 @@ git-diff-tree(1) Manual Page

When --stdin is specified, the command does not take <tree-ish> arguments from the command line. Instead, it - reads either one <commit> or a pair of <tree-ish> + reads either one <commit> or a list of <commit> separated with a single space from its standard input.

When a single commit is given on one line of such input, it compares the commit with its parents. The following flags further affects its -behavior. This does not apply to the case where two <tree-ish> -separated with a single space are given.

+behavior. The remaining commits, when given, are used as if they are +parents of the first commit.

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

diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 8c8f35b7a..1fdf20dcc 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -49,13 +49,13 @@ include::diff-options.txt[] --stdin:: When '--stdin' is specified, the command does not take arguments from the command line. Instead, it - reads either one or a pair of + reads either one or a list of separated with a single space from its standard input. + When a single commit is given on one line of such input, it compares the commit with its parents. The following flags further affects its -behavior. This does not apply to the case where two -separated with a single space are given. +behavior. The remaining commits, when given, are used as if they are +parents of the first commit. -m:: By default, 'git-diff-tree --stdin' does not show diff --git a/git.html b/git.html index 739832f72..f09232458 100644 --- a/git.html +++ b/git.html @@ -2024,7 +2024,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 3da5bf050..b1cb97236 100644 --- a/git.txt +++ b/git.txt @@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.5.6.4/git.html[documentation for release 1.5.6.4] +* link:v1.5.6.5/git.html[documentation for release 1.5.6.5] * release notes for + link:RelNotes-1.5.6.5.txt[1.5.6.5], link:RelNotes-1.5.6.4.txt[1.5.6.4], link:RelNotes-1.5.6.3.txt[1.5.6.3], link:RelNotes-1.5.6.2.txt[1.5.6.2], -- 2.26.2