diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-11-07 14:41:25 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-11-07 14:41:25 -0800 |
commit | 867b1c1bf68363bcfd17667d6d4b9031fa6a1300 (patch) | |
tree | c061a099c9a0df8d85e615ead9107c56f5d02d16 /Documentation | |
parent | Git 1.8.5-rc1 (diff) | |
parent | Start preparing for 1.8.4.3 (diff) | |
download | tgif-867b1c1bf68363bcfd17667d6d4b9031fa6a1300.tar.xz |
Sync with maint
* maint:
Start preparing for 1.8.4.3
gitignore.txt: fix documentation of "**" patterns
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/RelNotes/1.8.4.3.txt | 36 | ||||
-rw-r--r-- | Documentation/gitignore.txt | 6 |
2 files changed, 39 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.8.4.3.txt b/Documentation/RelNotes/1.8.4.3.txt new file mode 100644 index 0000000000..afb33598d0 --- /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/Documentation/gitignore.txt b/Documentation/gitignore.txt index 54e334e3af..f971960512 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 |