From 63777e2b67a953e153cb6950948822beeaf06fe8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 17 Nov 2007 20:52:16 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.5-737-gdee1b --- RelNotes-1.5.3.6.txt | 33 ++++++++++++++++++++++++++++++++- RelNotes-1.5.4.txt | 32 ++++++++++++++++++++++++++++++-- git-clone.html | 5 ++--- git-clone.txt | 1 + git-fetch.html | 2 +- git-pull.html | 2 +- git-push.html | 2 +- urls.txt | 6 ++++++ user-manual.html | 6 +++--- user-manual.txt | 6 +++--- 10 files changed, 80 insertions(+), 15 deletions(-) diff --git a/RelNotes-1.5.3.6.txt b/RelNotes-1.5.3.6.txt index 06e44f773..c9f948ec0 100644 --- a/RelNotes-1.5.3.6.txt +++ b/RelNotes-1.5.3.6.txt @@ -9,13 +9,44 @@ Fixes since v1.5.3.5 * git-svn dcommit used to clobber when sending a series of patches; + * git-svn dcommit failed after attempting to rebase when + started with a dirty index; now it stops upfront. + * git-grep sometimes refused to work when your index was unmerged; + * git-hash-object did not honor configuration variables, such as + core.compression. + + * git-index-pack choked on a huge pack on 32-bit machines, even when + large file offsets are supported. + + * atom feeds from git-web said "10" for the month of November. + + * a memory leak in commit walker was plugged. + + * When git-send-email inserted the original author's From: + address in body, it did not mark the message with + Content-type: as needed. + + * git-revert and git-cherry-pick incorrectly refused to start + when the work tree was dirty. + + * git-clean did not honor core.excludesfile configuration. + + * git-add mishandled ".gitignore" files when applying them to + subdirectories. + + * While importing a too branchy history, git-fastimport did not + honor delta depth limit properly. + + * Support for zlib implementations that lack ZLIB_VERNUM and definition + of deflateBound() has been added. + * Quite a lot of documentation clarifications. -- exec >/var/tmp/1 -O=v1.5.3.5-32-gcb6c162 +O=v1.5.3.5-57-gb574c8d echo O=`git describe refs/heads/maint` git shortlog --no-merges $O..refs/heads/maint diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt index 93fb9c914..229d77342 100644 --- a/RelNotes-1.5.4.txt +++ b/RelNotes-1.5.4.txt @@ -32,6 +32,10 @@ Updates since v1.5.3 (read: safer than the usual one) after the user accumulates too many loose objects. + * You need to explicitly set clean.requireForce to true to allow + git-clean to do any damage now (the configuration variable used + to default to false). + * git-push has been rewritten in C. * git-push learned --dry-run option to show what would happen @@ -56,7 +60,28 @@ Updates since v1.5.3 * git-bisect learned "skip" action to mark untestable commits. - * rename detection diff family, while detecting exact matches, + * git-format-patch learned "format.numbered" configuration variable + to automatically turn --numbered option on when more than one + commits are formatted. + + * git-ls-files learned "--exclude-standard" to use the canned + set of exclude files. + + * git-rebase now detaches head during its operation, so after a + successful "git rebase" operation, the reflog entry branch@{1} + for the current branch points at the commit before the rebase + was started. + + * "git-tag -a -f existing" begins the editor session using the + existing annotation message. + + * "git cvsexportcommit" learned -w option to specify and switch + to the CVS working directory. + + * Output processing for '--pretty=format:' has + been optimized. + + * Rename detection diff family, while detecting exact matches, has been greatly optimized. * Example update and post-receive hooks have been improved. @@ -77,8 +102,11 @@ Fixes since v1.5.3 All of the fixes in v1.5.3 maintenance series are included in this release, unless otherwise noted. + * git-svn talking with the SVN over http will correctly quote branch + and project names. + -- exec >/var/tmp/1 -O=v1.5.3.5-618-g5d4138a +O=v1.5.3.5-736-geb9d2b9 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-clone.html b/git-clone.html index 56fd4da61..fc507d658 100644 --- a/git-clone.html +++ b/git-clone.html @@ -566,8 +566,7 @@ file:///path/to/repo.git/ -

They are mostly equivalent, except when cloning. See -git-clone(1) for details.

+

They are equivalent, except the former implies --local option.

Examples

@@ -641,7 +640,7 @@ Create a repository on the kernel.org machine that borrows from Linus
diff --git a/git-clone.txt b/git-clone.txt index 14e58f386..c90bcece2 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -130,6 +130,7 @@ OPTIONS for "host.xz:foo/.git"). Cloning into an existing directory is not allowed. +:git-clone: 1 include::urls.txt[] Examples diff --git a/git-fetch.html b/git-fetch.html index 35161a71f..98e5c092b 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -664,7 +664,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-pull.html b/git-pull.html index 10ccb0c09..912c8747a 100644 --- a/git-pull.html +++ b/git-pull.html @@ -946,7 +946,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-push.html b/git-push.html index 74d5d3cdd..6d2925f49 100644 --- a/git-push.html +++ b/git-push.html @@ -621,7 +621,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/urls.txt b/urls.txt index e67f9140a..4f667382e 100644 --- a/urls.txt +++ b/urls.txt @@ -36,5 +36,11 @@ To sync with a local directory, you can use: - file:///path/to/repo.git/ =============================================================== +ifndef::git-clone[] They are mostly equivalent, except when cloning. See gitlink:git-clone[1] for details. +endif::git-clone[] + +ifdef::git-clone[] +They are equivalent, except the former implies --local option. +endif::git-clone[] diff --git a/user-manual.html b/user-manual.html index c1b7efdc6..ee2576f03 100644 --- a/user-manual.html +++ b/user-manual.html @@ -616,9 +616,9 @@ other git operations are in progress in the same repository.

Fortunately, git also keeps a log, called a "reflog", of all the previous values of each branch. So in this case you can still find the -old history using, for example,

$ git log master@{1}

This lists the commits reachable from the previous version of the head. -This syntax can be used with any git command that accepts a commit, -not just with git log. Some other examples:

$ git show master@{2}           # See where the branch pointed 2,
+old history using, for example,

$ git log master@{1}

This lists the commits reachable from the previous version of the +"master" branch head. This syntax can be used with any git command +that accepts a commit, not just with git log. Some other examples:

$ git show master@{2}           # See where the branch pointed 2,
$ git show master@{3}           # 3, ... changes ago.
$ gitk master@{yesterday}       # See where it pointed yesterday,
$ gitk master@{"1 week ago"}    # ... or last week
diff --git a/user-manual.txt b/user-manual.txt index c7cfbbccf..518b7b5c9 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -1567,9 +1567,9 @@ old history using, for example, $ git log master@{1} ------------------------------------------------- -This lists the commits reachable from the previous version of the head. -This syntax can be used with any git command that accepts a commit, -not just with git log. Some other examples: +This lists the commits reachable from the previous version of the +"master" branch head. This syntax can be used with any git command +that accepts a commit, not just with git log. Some other examples: ------------------------------------------------- $ git show master@{2} # See where the branch pointed 2, -- 2.26.2