Eighth batch for 2.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 31, 2015 at 15:40 UTC
16163602bacb2804d00d599049a62b7af0b0b7b6
1 file changed
+39
Documentation/RelNotes/2.6.0.txt
+39
@@ -71,6 +71,19 @@ UI, Workflows & Features
71
* A new configuration variable http.sslVersion can be used to specify
72
what specific version of SSL/TLS to use to make a connection.
73
74
+ * "git notes merge" can be told with "--strategy=<how>" option how to
75
+ automatically handle conflicts; this can now be configured by
76
+ setting notes.mergeStrategy configuration variable.
77
+
78
+ * "git log --cc" did not show any patch, even though most of the time
79
+ the user meant "git log --cc -p -m" to see patch output for commits
80
+ with a single parent, and combined diff for merge commits. The
81
+ command is taught to DWIM "--cc" (without "--raw" and other forms
82
+ of output specification) to "--cc -p -m".
83
+
84
+ * "git config --list" output was hard to parse when values consist of
85
+ multiple lines. "--name-only" option is added to help this.
86
+
87
88
Performance, Internal Implementation, Development Support etc.
89
@@ -132,6 +145,9 @@ Performance, Internal Implementation, Development Support etc.
145
ref-like things like MERGE_HEAD that are per-worktree (they will
146
always be written to the filesystem inside $GIT_DIR).
147
148
+ * The gitmodules API that is accessed from the C code learned to
149
+ cache stuff lazily.
150
+
151
152
Also contains various documentation updates and code clean-ups.
153
@@ -263,6 +279,29 @@ notes for details).
279
has a colon as the end of existing trailer.
280
(merge 6262fe9 cc/trailers-corner-case-fix later to maint).
281
282
+ * "git describe" without argument defaulted to describe the HEAD
283
+ commit, but "git describe --contains" didn't. Arguably, in a
284
+ repository used for active development, such defaulting would not
285
+ be very useful as the tip of branch is typically not tagged, but it
286
+ is better to be consistent.
287
+ (merge 2bd0706 sg/describe-contains later to maint).
288
+
289
+ * The client side codepaths in "git push" have been cleaned up
290
+ and the user can request to perform an optional "signed push",
291
+ i.e. sign only when the other end accepts signed push.
292
+ (merge 68c757f db/push-sign-if-asked later to maint).
293
+
294
+ * Because the configuration system does not allow "alias.0foo" and
295
+ "pager.0foo" as the configuration key, the user cannot use '0foo'
296
+ as a custom command name anyway, but "git 0foo" tried to look these
297
+ keys up and emitted useless warnings before saying '0foo is not a
298
+ git command'. These warning messages have been squelched.
299
+ (merge 9e9de18 jk/fix-alias-pager-config-key-warnings later to maint).
300
+
301
+ * "git rev-list" does not take "--notes" option, but did not complain
302
+ when one is given.
303
+ (merge 2aea7a5 jk/rev-list-has-no-notes later to maint).
304
+
305
* Code cleanups and documentation updates.
306
(merge 1c601af es/doc-clean-outdated-tools later to maint).
307
(merge 3581304 kn/tag-doc-fix later to maint).