Second batch for post 2.8 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 6, 2016 at 11:44 UTC
72d917a7f9a5123ef7c0d6db306bbc0d385227e2
2 files changed
+51
-2
Documentation/RelNotes/2.9.0.txt
+50
-1
@@ -25,6 +25,20 @@ UI, Workflows & Features
25
* A new "interactive.diffFilter" configuration can be used to
26
customize the diff shown in "git add -i" session.
27
28
+ * "git p4" now allows P4 author names to be mapped to Git author
29
+ names.
30
+
31
+ * "git rebase -x" can be used without passing "-i" option.
32
+
33
+ * "git -c credential.<var>=<value> submodule" can now be used to
34
+ propagate configuration variables related to credential helper
35
+ down to the submodules.
36
+
37
+ * "git tag" can create an annotated tag without explicitly given an
38
+ "-a" (or "-s") option (i.e. when a tag message is given). A new
39
+ configuration variable, tag.forceSignAnnotated, can be used to tell
40
+ the command to create signed tag in such a situation.
41
+
42
43
Performance, Internal Implementation, Development Support etc.
44
@@ -35,7 +49,6 @@ Performance, Internal Implementation, Development Support etc.
49
50
* A test for tags has been restructured so that more parts of it can
51
easily be run on a platform without a working GnuPG.
38
- (merge 618310a es/test-gpg-tags later to maint).
52
53
* The startup_info data, which records if we are working inside a
54
repository (among other things), are now uniformly available to Git
@@ -43,6 +56,20 @@ Performance, Internal Implementation, Development Support etc.
56
references when we are not in a repository.
57
(merge 11e6b3f jk/startup-info later to maint).
58
59
+ * The command line argument parser for "receive-pack" has been
60
+ rewritten to use parse-options.
61
+
62
+ * A major part of "git submodule update" has been ported to C to take
63
+ advantage of the recently added framework to run download tasks in
64
+ parallel.
65
+
66
+ * Rename bunch of tests on "git clone" for better organization.
67
+ (merge 8fbb03a sb/clone-t57-t56 later to maint).
68
+
69
+ * The tests that involve running httpd leaked the system-wide
70
+ configuration in /etc/gitconfig to the tested environment.
71
+ (merge 1fad503 jk/test-httpd-config-nosystem later to maint).
72
+
73
74
Also contains various documentation updates and code clean-ups.
75
@@ -79,6 +106,28 @@ notes for details).
106
corner cases in its error codepath.
107
(merge b709043 jk/getwholeline-getdelim-empty later to maint).
108
109
+ * "git mergetool" did not work well with conflicts that both sides
110
+ deleted.
111
+ (merge a298604 da/mergetool-delete-delete-conflict later to maint).
112
+
113
+ * "git send-email" had trouble parsing alias file in mailrc format
114
+ when lines in it had trailing whitespaces on them.
115
+ (merge a277d1e jk/send-email-rtrim-mailrc-alias later to maint).
116
+
117
+ * When "git merge --squash" stopped due to conflict, the concluding
118
+ "git commit" failed to read in the SQUASH_MSG that shows the log
119
+ messages from all the squashed commits.
120
+ (merge b64c1e0 ss/commit-squash-msg later to maint).
121
+
122
+ * "git merge FETCH_HEAD" dereferenced NULL pointer when merging
123
+ nothing into an unborn history (which is arguably unusual usage,
124
+ which perhaps was the reason why nobody noticed it).
125
+ (merge b84e65d jv/merge-nothing-into-void later to maint).
126
+
127
* Other minor clean-ups and documentation updates
128
(merge aed7480 mm/lockfile-error-message later to maint).
129
(merge bfee614 jc/index-pack later to maint).
130
+ (merge f870899 ss/exc-flag-is-a-collection-of-bits later to maint).
131
+ (merge dde7891 pb/t7502-drop-dup later to maint).
132
+ (merge 3bd1b51 cc/doc-recommend-performance-trace-to-file later to maint).
133
+ (merge 7d5e9c9 jk/credential-cache-comment-exit later to maint).
RelNotes
+1
-1
@@ -1 +1 @@
1
-Documentation/RelNotes/2.8.1.txt
\ No newline at end of file
1
+Documentation/RelNotes/2.9.0.txt
\ No newline at end of file