From: Junio C Hamano
Date: Sun, 8 Apr 2007 08:31:07 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.1-92-g8d160
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f8499811b219581fa610727afe6dc9c4a8627412;p=git.git
Autogenerated HTML docs for v1.5.1-92-g8d160
---
diff --git a/RelNotes-1.5.1.1.txt b/RelNotes-1.5.1.1.txt
new file mode 100644
index 000000000..b48b4bc3e
--- /dev/null
+++ b/RelNotes-1.5.1.1.txt
@@ -0,0 +1,46 @@
+GIT v1.5.1.1 Release Notes (draft)
+==========================
+
+Fixes since v1.5.1
+------------------
+
+* Documentation updates
+
+ - The --left-right option of rev-list and friends is documented.
+
+ - The documentation for cvsimport has been majorly improved.
+
+* Bugfixes
+
+ - "git send-email" produced of References header of unbounded length;
+ fixed this with line-folding.
+
+ - "git archive" to download from remote site should not
+ require you to be in a git repository, but it incorrectly
+ did.
+
+ - "git apply" ignored -p for "diff --git" formatted
+ patches.
+
+ - "git rerere" recorded a conflict that had one side empty
+ (the other side adds) incorrectly; this made merging in the
+ other direction fail to use previously recorded resolution.
+
+ - t4200 test was broken where "wc -l" pads its output with
+ spaces.
+
+ - "git branch -m old new" to rename branch did not work
+ without a configuration file in ".git/config".
+
+ - The sample hook for notification e-mail was misnamed.
+
+ - gitweb did not show type-changing patch correctly in the
+ blobdiff view.
+
+* Performance Tweaks
+
+--
+exec >/var/tmp/1
+O=v1.5.1-26-ge94a4f6
+echo O=`git describe refs/heads/maint`
+git shortlog --no-merges $O..refs/heads/maint
diff --git a/RelNotes-1.5.2.txt b/RelNotes-1.5.2.txt
new file mode 100644
index 000000000..2e3c7bc4f
--- /dev/null
+++ b/RelNotes-1.5.2.txt
@@ -0,0 +1,76 @@
+GIT v1.5.2 Release Notes (draft)
+========================
+
+Updates since v1.5.1
+--------------------
+
+* New commands and options.
+
+ - "git bisect start" can optionally take a single bad commit and
+ zero or more good commits on the command line.
+
+* Updated behavior of existing commands.
+
+ - "git diff --stat" shows size of preimage and postimage blobs
+ for binary contents. Earlier it only said "Bin".
+
+ - "git lost-found" shows stuff that are unreachable except
+ from reflogs.
+
+ - "git checkout branch^0" now detaches HEAD at the tip commit
+ on the named branch, instead of just switching to the
+ branch (use "git checkout branch" to switch to the branch,
+ as before).
+
+ - "git bisect next" can be used after giving only a bad commit
+ without giving a good one (this starts bisection half-way to
+ the root commit). We used to refuse to operate without a
+ good and a bad commit.
+
+* Builds
+
+ - git-p4import has never been installed; now there is an
+ installation option to do so.
+
+ - gitk and git-gui can be configured out.
+
+ - Generated documentation pages automatically get version
+ information from GIT_VERSION
+
+ - Parallel build with "make -j" descending into subdirectory
+ was fixed.
+
+* Performance Tweaks
+
+ - optimized "git-rev-list --bisect" (hence "git-bisect").
+
+ - optimized "git-add $path" in a large directory, most of
+ whose contents are ignored.
+
+
+Fixes since v1.5.1
+------------------
+
+The following are all in v1.5.1.x series, unless otherwise noted.
+
+* Documentation updates
+
+* Bugfixes
+
+ - Switching branches with "git checkout" refused to work when
+ a path changes from a file to a directory between the
+ current branch and the new branch, in order not to lose
+ possible local changes in the directory that is being turned
+ into a file with the switch. We now allow such a branch
+ switch after making sure that there is no locally modified
+ file nor un-ignored file in the directory. This has not
+ been backported to 1.5.1.x series, as it is rather an
+ intrusive change.
+
+* Performance Tweaks
+
+--
+exec >/var/tmp/1
+O=v1.5.1-91-g640ee0d
+echo O=`git describe refs/heads/master`
+git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
diff --git a/git-cvsserver.html b/git-cvsserver.html
index 7a96e5c58..85bc8da04 100644
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -397,11 +397,11 @@ Pick HEAD when it asks what branch/tag to check out. Untick the
Protocol notes: If you are using anonymous access via pserver, just select that.
Those using SSH access should choose the ext protocol, and configure ext
access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to
-git-cvsserver. Not that password support is not good when using ext,
+git-cvsserver. Note that password support is not good when using ext,
you will definitely want to have SSH keys setup.
Alternatively, you can just use the non-standard extssh protocol that Eclipse
offer. In that case CVS_SERVER is ignored, and you will have to replace
-the cvs utility on the server with git-cvsserver or manipulate your .bashrc
+the cvs utility on the server with git-cvsserver or manipulate your .bashrc
so that calling cvs effectively calls git-cvsserver.
Clients known to work
@@ -435,9 +435,9 @@ TortoiseCVS
checkout, diff, status, update, log, add, remove, commit.
Legacy monitoring operations are not supported (edit, watch and related).
Exports and tagging (tags and branches) are not supported at this stage.
-The server should set the -k mode to binary when relevant, however,
+
The server should set the -k mode to binary when relevant, however,
this is not really implemented yet. For now, you can force the server
-to set -kb for all files by setting the gitcvs.allbinary config
+to set -kb for all files by setting the gitcvs.allbinary config
variable. In proper GIT tradition, the contents of the files are
always respected. No keyword expansion or newline munging is supported.
@@ -473,7 +473,7 @@ Martin Langhoff <martin@catalyst.net.nz>