Third batch for 1.7.12

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jun 28, 2012 at 15:35 UTC e7b44f182bc1b2ac32eadbc477a76a185f49ac88
1 file changed +43
Documentation/RelNotes/1.7.12.txt
+43
@@ -20,6 +20,20 @@ UI, Workflows & Features
20 the wire, so that the server log can be examined to see the vintage
21 distribution of clients.
22
23 + * "git rebase -i" learned "-x <cmd>" to insert "exec <cmd>" after
24 + each commit in the resulting history.
25 +
26 + * "git status" gives finer classification to various states of paths
27 + in conflicted state and offer advice messages in its output.
28 +
29 + * "git submodule" learned to deal with nested submodule structure
30 + where a module is contained within a module whose origin is
31 + specified as a relative URL to its superproject's origin.
32 +
33 + * A rather heavy-ish "git completion" script has been split to create
34 + a separate "git prompting" script, to help lazy-autoloading of the
35 + completion part while making prompting part always available.
36 +
37
38 Foreign Interface
39
@@ -31,6 +45,14 @@ Performance, Internal Implementation, etc. (please report possible regressions)
45 * We no longer use AsciiDoc7 syntax in our documentation and favor a
46 more modern style.
47
48 + * "git index-pack" and "git pack-objects" use streaming API to read
49 + from the object store to avoid having to hold a large blob object
50 + in-core while they are doing their thing.
51 +
52 + * Code to match paths with exclude patterns learned to avoid calling
53 + fnmatch() by comparing fixed leading substring literally when
54 + possible.
55 +
56
57 Also contains minor documentation updates and code clean-ups.
58
@@ -42,6 +64,27 @@ Unless otherwise noted, all the fixes since v1.7.11 in the maintenance
64 releases are contained in this release (see release notes to them for
65 details).
66
67 + * When "git log" gets "--simplify-merges/by-decoration" together with
68 + "--first-parent", the combination of these options makes the
69 + simplification logic to use in-core commit objects that haven't
70 + been examined for relevance, either producing incorrect result or
71 + taking too long to produce any output. Teach the simplification
72 + logic to ignore commits that the first-parent traversal logic
73 + ignored when both are in effect to work around the issue.
74 + (merge 6e513ba jc/rev-list-simplify-merges-first-parent later to maint).
75 +
76 + * "git add" allows adding a regular file to the path where a
77 + submodule used to exist, but "git update-index" does not allow an
78 + equivalent operation to Porcelain writers.
79 + (merge 242f55f hv/submodule-update-nuke-submodules later to maint).
80 +
81 + * "git diff --no-index" did not work with pagers correctly.
82 + (merge af63b54 jk/diff-no-index-pager later to maint).
83 +
84 + * "git diff COPYING HEAD:COPYING" gave a nonsense error message that
85 + claimed that the treeish HEAD did not have COPYING in it.
86 + (merge 023e37c mm/verify-filename-fix later to maint).
87 +
88 * The documentation for "git cherry-pick A B..C" was misleading.
89 (merge b98878e cn/cherry-pick-range-docs later to maint).
90