Post 2.3 cycle (batch #12)

Hopefully with another batch or two, we would be ready for -rc0 to close this cycle. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Mar 23, 2015 at 11:36 UTC 9b22801c186a2a82313a41344c0366985d417773
1 file changed +46 -15
Documentation/RelNotes/2.4.0.txt
+46 -15
@@ -4,24 +4,36 @@ Git 2.4 Release Notes
4 Backward compatibility warning(s)
5 ---------------------------------
6
7 -Output from "git log --decorate" (and "%d" format specifier used in
8 -the userformat "--format=<string>" parameter "git log" family of
9 -command takes) used to list "HEAD" just like other tips of branch
10 -names, separated with a comma in between. E.g.
7 +This release has a few changes in the user-visible output from
8 +Porcelain commands, which the users may want to be aware of.
9
12 - $ git log --decorate -1 master
13 - commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD, master)
14 - ...
10 + * Output from "git log --decorate" (and "%d" format specifier used in
11 + the userformat "--format=<string>" parameter "git log" family of
12 + command takes) used to list "HEAD" just like other tips of branch
13 + names, separated with a comma in between. E.g.
14
16 -This release updates the output slightly when HEAD refers to the tip
17 -of a branch whose name is also shown in the output. The above is
18 -shown as:
15 + $ git log --decorate -1 master
16 + commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD, master)
17 + ...
18
20 - $ git log --decorate -1 master
21 - commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD -> master)
22 - ...
19 + This release updates the output slightly when HEAD refers to the tip
20 + of a branch whose name is also shown in the output. The above is
21 + shown as:
22
23 + $ git log --decorate -1 master
24 + commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD -> master)
25 + ...
26
27 + * The phrasing "git branch" uses to describe a detached HEAD has been
28 + updated to match that of "git status":
29 +
30 + - When the HEAD is at the same commit as it was originally
31 + detached, they now both show "detached at <commit object name>".
32 +
33 + - When the HEAD has moved since it was originally detached,
34 + they now both show "detached from <commit object name>".
35 +
36 + Earlier "git branch" always used "from"
37
38
39 Updates since v2.3
@@ -91,7 +103,6 @@ UI, Workflows & Features
103 actually at xyz and haven't been moved since it was detached in
104 such a case, but the user cannot read what the current value of
105 HEAD is when "detached from" is used.
94 - (merge 4b06318 mg/detached-head-report later to maint).
106
107 * "git -C '' subcmd" refused to work in the current directory, unlike
108 "cd ''" which silently behaves as a no-op.
@@ -100,6 +111,9 @@ UI, Workflows & Features
111 * The versionsort.prerelease configuration variable can be used to
112 specify that v1.0-pre1 comes before v1.0.
113
114 + * A new "push.followTags" configuration turns the "--follow-tags"
115 + option on by default for the "git push" command.
116 +
117
118 Performance, Internal Implementation, Development Support etc.
119
@@ -151,6 +165,9 @@ Performance, Internal Implementation, Development Support etc.
165 * Code in "git daemon" to parse out and hold hostnames used in
166 request interpolation has been simplified.
167
168 + * "git push" codepath has been restructured to make it easier to add
169 + new configuration bits.
170 +
171
172 Also contains various documentation updates and code clean-ups.
173
@@ -370,7 +387,20 @@ notes for details).
387 branch names.
388 (merge 5ee8758 jc/decorate-leaky-separator-color later to maint).
389
373 - * Code cleanups and documentaiton updates.
390 + * The code that reads from the ctags file in the completion script
391 + (in contrib/) did not spell ${param/pattern/string} substitution
392 + correctly, which happened to work with bash but not with zsh.
393 + (merge db8d750 js/completion-ctags-pattern-substitution-fix later to maint).
394 +
395 + * The transfer.hiderefs support did not quite work for smart-http
396 + transport.
397 + (merge 8ddf3ca jk/smart-http-hide-refs later to maint).
398 +
399 + * "git tag -h" used to show the "--column" and "--sort" options
400 + that are about listing in a wrong section.
401 + (merge dd059c6 jk/tag-h-column-is-a-listing-option later to maint).
402 +
403 + * Code cleanups and documentation updates.
404 (merge 2ce63e9 rs/simple-cleanups later to maint).
405 (merge 33baa69 rj/no-xopen-source-for-cygwin later to maint).
406 (merge 817d03e jc/diff-test-updates later to maint).
@@ -381,3 +411,4 @@ notes for details).
411 (merge 8fa7975 ak/git-done-help-cleanup later to maint).
412 (merge 9a6f128 rs/deflate-init-cleanup later to maint).
413 (merge 6f75d45 rs/use-isxdigit later to maint).
414 + (merge 376e4b3 jk/test-annoyances later to maint).