From cf77b0414a44eadfcd0c74dfcae739427b7d2cce Mon Sep 17 00:00:00 2001
From: Junio C Hamano
Date: Tue, 17 Dec 2013 15:54:21 -0800
Subject: [PATCH] Autogenerated HTML docs for v1.8.5.2-192-g7794
---
RelNotes/1.8.5.2.txt | 20 ++++++++++++++++++++
RelNotes/1.9.txt | 37 +++++++++++++++++++++++++++++++++++++
git-fetch.html | 4 +++-
git-fetch.txt | 3 +++
git-merge.html | 7 +++++++
git-pull.html | 7 +++++++
git-rebase.html | 7 +++++++
git.txt | 3 ++-
gitignore.html | 20 +++++++++++++++++---
gitignore.txt | 19 +++++++++++++++++--
gitweb.conf.html | 41 ++++++++++++++++++++++++++++++++++++++++-
gitweb.conf.txt | 37 +++++++++++++++++++++++++++++++++++++
merge-strategies.txt | 8 ++++++++
13 files changed, 205 insertions(+), 8 deletions(-)
create mode 100644 RelNotes/1.8.5.2.txt
diff --git a/RelNotes/1.8.5.2.txt b/RelNotes/1.8.5.2.txt
new file mode 100644
index 000000000..3ac4984f1
--- /dev/null
+++ b/RelNotes/1.8.5.2.txt
@@ -0,0 +1,20 @@
+Git v1.8.5.2 Release Notes
+==========================
+
+Fixes since v1.8.5.1
+--------------------
+
+ * "git diff -- ':(icase)makefile'" was unnecessarily rejected at the
+ command line parser.
+
+ * "git cat-file --batch-check=ok" did not check the existence of
+ the named object.
+
+ * "git am --abort" sometimes complained about not being able to write
+ a tree with an 0{40} object in it.
+
+ * Two processes creating loose objects at the same time could have
+ failed unnecessarily when the name of their new objects started
+ with the same byte value, due to a race condition.
+
+Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/RelNotes/1.9.txt b/RelNotes/1.9.txt
index 7120c220e..a966ab488 100644
--- a/RelNotes/1.9.txt
+++ b/RelNotes/1.9.txt
@@ -84,6 +84,10 @@ Foreign interfaces, subsystems and ports.
UI, Workflows & Features
+ * "gitweb" learned to treat ref hierarchies other than refs/heads as
+ if they are additional branch namespaces (e.g. refs/changes/ in
+ Gerrit).
+
* "git for-each-ref --format=..." learned a few formatting directives;
e.g. "%(color:red)%(HEAD)%(color:reset) %(refname:short) %(subject)".
@@ -105,6 +109,12 @@ UI, Workflows & Features
Performance, Internal Implementation, etc.
+ * The deprecated parse-options macro OPT_BOOLEAN has been removed;
+ use OPT_BOOL or OPT_COUNTUP in new code.
+
+ * A few duplicate implementations of prefix/suffix string comparison
+ functions have been unified to starts_with() and ends_with().
+
* The new PERLLIB_EXTRA makefile variable can be used to specify
additional directories Perl modules (e.g. the ones necessary to run
git-svn) are installed on the platform when building.
@@ -131,6 +141,33 @@ Unless otherwise noted, all the fixes since v1.8.5 in the maintenance
track are contained in this release (see the maintenance releases' notes
for details).
+ * "git mv A B/", when B does not exist as a directory, should error
+ out, but it didn't.
+ (merge c57f628 mm/mv-file-to-no-such-dir-with-slash later to maint).
+
+ * A workaround to an old bug in glibc prior to glibc 2.17 has been
+ retired; this would remove a side effect of the workaround that
+ corrupts system error messages in non-C locales.
+
+ * SSL-related options were not passed correctly to underlying socket
+ layer in "git send-email".
+ (merge 5508f3e tr/send-email-ssl later to maint).
+
+ * "git commit -v" appends the patch to the log message before
+ editing, and then removes the patch when the editor returned
+ control. However, the patch was not stripped correctly when the
+ first modified path was a submodule.
+ (merge 1a72cfd jl/commit-v-strip-marker later to maint).
+
+ * "git fetch --depth=0" was a no-op, and was silently ignored.
+ Diagnose it as an error.
+ (merge 5594bca nd/transport-positive-depth-only later to maint).
+
+ * Remote repository URL expressed in scp-style host:path notation are
+ parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks
+ to connect to user's home directory on host at address ::1.
+ (merge a2036d7 tb/clone-ssh-with-colon-for-port later to maint).
+
* "git diff -- ':(icase)makefile'" was unnecessarily rejected at the
command line parser.
(merge 887c6c1 nd/magic-pathspec later to maint).
diff --git a/git-fetch.html b/git-fetch.html
index bdec1e878..144d1dea6 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -773,6 +773,8 @@ DESCRIPTION
or from several repositories at once if <group> is given and
there is a remotes.<group> entry in the configuration file.
(See git-config(1)).
+When no remote is specified, by default the origin
remote will be used,
+unless there’s an upstream branch configured for the current branch.
@@ -1424,7 +1426,7 @@
GIT