RelNotes: the third batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 20, 2012 at 15:58 UTC
d1ca788fcd34962a65924843ef1d0c773d565030
1 file changed
+27
-1
Documentation/RelNotes/1.7.11.txt
+27
-1
@@ -16,6 +16,20 @@ UI, Workflows & Features
16
variables with REMOTE_USER and REMOTE_ADDR, but these variables are
17
now preserved when set.
18
19
+ * "git am" learned the "--include" option, which is an opposite of
20
+ existing the "--exclude" option.
21
+
22
+ * When "git am -3" needs to fall back to an application to a
23
+ synthesized preimage followed by a 3-way merge, the paths that
24
+ needed such treatment are now reported to the end user, so that the
25
+ result in them can be eyeballed with extra care.
26
+
27
+ * The "fmt-merge-msg" command learns to list the primary contributors
28
+ involved in the side topic you are merging.
29
+
30
+ * The cases "git push" fails due to non-ff can be broken into three
31
+ categories; each case is given a separate advise message.
32
+
33
* A 'snapshot' request to "gitweb" honors If-Modified-Since: header,
34
based on the commit date.
35
@@ -35,7 +49,7 @@ Internal Implementation (please report possible regressions)
49
50
* Because "sh" on the user's PATH may be utterly broken on some
51
systems, run-command API now uses SHELL_PATH, not /bin/sh, when
38
- spawning an external command.
52
+ spawning an external command (not applicable to Windows port).
53
54
Also contains minor documentation updates and code clean-ups.
55
@@ -47,6 +61,18 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
61
releases are contained in this release (see release notes to them for
62
details).
63
64
+ * When PATH contains an unreadable directory, alias expansion code
65
+ did not kick in, and failed with an error that said "git-subcmd"
66
+ was not found.
67
+ (merge 38f865c jk/run-command-eacces later to maint).
68
+
69
+ * The 'push to upstream' implementation was broken in some corner
70
+ cases. "git push $there" without refspec, when the current branch
71
+ is set to push to a remote different from $there, used to push to
72
+ $there using the upstream information to a remote unreleated to
73
+ $there.
74
+ (merge 135dade jc/push-upstream-sanity later to maint).
75
+
76
* "git clean -d -f" (not "-d -f -f") is supposed to protect nested
77
working trees of independent git repositories that exist in the
78
current project working tree from getting removed, but the