From 8447dc890488a953ab190e8826bc9dd175b28df9 Mon Sep 17 00:00:00 2001 From: Karsten Blees Date: Thu, 7 Nov 2013 17:30:47 +0100 Subject: [PATCH 1/2] gitignore.txt: fix documentation of "**" patterns "**" means bold in ASCIIDOC, so we need to escape it. Signed-off-by: Karsten Blees Signed-off-by: Junio C Hamano --- Documentation/gitignore.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 54e334e3a..f97196051 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -113,12 +113,12 @@ full pathname may have special meaning: - A leading "`**`" followed by a slash means match in all directories. For example, "`**/foo`" matches file or directory - "`foo`" anywhere, the same as pattern "`foo`". "**/foo/bar" + "`foo`" anywhere, the same as pattern "`foo`". "`**/foo/bar`" matches file or directory "`bar`" anywhere that is directly under directory "`foo`". - - A trailing "/**" matches everything inside. For example, - "abc/**" matches all files inside directory "abc", relative + - A trailing "`/**`" matches everything inside. For example, + "`abc/**`" matches all files inside directory "`abc`", relative to the location of the `.gitignore` file, with infinite depth. - A slash followed by two consecutive asterisks then a slash From 486b65a4c3fe3a62e3793dba8c0c6e303b237fc9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 7 Nov 2013 14:39:47 -0800 Subject: [PATCH 2/2] Start preparing for 1.8.4.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.4.3.txt | 36 ++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.8.4.3.txt diff --git a/Documentation/RelNotes/1.8.4.3.txt b/Documentation/RelNotes/1.8.4.3.txt new file mode 100644 index 000000000..afb33598d --- /dev/null +++ b/Documentation/RelNotes/1.8.4.3.txt @@ -0,0 +1,36 @@ +Git v1.8.4.3 Release Notes +======================== + +Fixes since v1.8.4.2 +-------------------- + + * "git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the + output, but "git rev-list --objects v1.0^..v1.0" did not. + + * The fall-back parsing of commit objects with broken author or + committer lines were less robust than ideal in picking up the + timestamps. + + * Bash prompting code to deal with an SVN remote as an upstream + were coded in a way not supported by older Bash versions (3.x). + + * "git checkout topic", when there is not yet a local "topic" branch + but there is a unique remote-tracking branch for a remote "topic" + branch, pretended as if "git checkout -t -b topic remote/$r/topic" + (for that unique remote $r) was run. This hack however was not + implemented for "git checkout topic --". + + * Coloring around octopus merges in "log --graph" output was screwy. + + * We did not generate HTML version of documentation to "git subtree" + in contrib/. + + * The synopsis section of "git unpack-objects" documentation has been + clarified a bit. + + * An ancient How-To on serving Git repositories on an HTTP server + lacked a warning that it has been mostly superseded with more + modern way. + +Also contains a handful of trivial code clean-ups, documentation +updates, updates to the test suite, etc. diff --git a/RelNotes b/RelNotes index c3d6c6c27..13a018df3 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.8.4.2.txt \ No newline at end of file +Documentation/RelNotes/1.8.4.3.txt \ No newline at end of file