First batch for 2.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 3, 2014 at 12:08 UTC
79dcccc503ac228630ecf15dcf8e1d9455daef2d
3 files changed
+88
-2
Documentation/RelNotes/2.1.0.txt
new
+86
@@ -0,0 +1,86 @@
1
+Git v2.1 Release Notes
2
+======================
3
+
4
+Updates since v2.0
5
+------------------
6
+
7
+UI, Workflows & Features
8
+
9
+ * "git commit --date=<date>" option learned to read from more
10
+ timestamp formats, including "--date=now".
11
+
12
+ * "git grep" learned grep.fullname configuration variable to force
13
+ "--full-name" to be default. This may cause regressions on
14
+ scripted users that do not expect this new behaviour.
15
+
16
+ * "git merge" without argument, even when there is an upstream
17
+ defined for the current branch, refused to run until
18
+ merge.defaultToUpstream is set to true. Flip the default of that
19
+ configuration variable to true.
20
+
21
+ * "git mergetool" learned to drive the vimdiff3 backend.
22
+
23
+ * mergetool.prompt used to default to 'true', always asking "do you
24
+ really want to run the tool on this path?". Among the two
25
+ purposes this prompt serves, ignore the use case to confirm that
26
+ the user wants to view particular path with the named tool, and
27
+ redefine the meaning of the prompt only to confirm the choice of
28
+ the tool made by the autodetection (for those who configured the
29
+ tool explicitly, the prompt shown for the latter purpose is
30
+ simply annoying).
31
+
32
+ Strictly speaking, this is a backward incompatible change and the
33
+ users need to explicitly set the variable to 'true' if they want
34
+ to resurrect the now-ignored use case.
35
+
36
+ * "git svn" learned to cope with malformed timestamps with only one
37
+ digit in the hour part, e.g. 2014-01-07T5:01:02.048176Z, emitted
38
+ by some broken subversion server implementations.
39
+
40
+
41
+Performance, Internal Implementation, etc.
42
+
43
+ * "git diff" that compares 3-or-more trees (e.g. parents and the
44
+ result of a merge) have been optimized.
45
+
46
+ * The API to update/delete references are being converted to handle
47
+ updates to multiple references in a transactional way. As an
48
+ example, "update-ref --stdin [-z]" has been updated to use this
49
+ API.
50
+
51
+
52
+Also contains various documentation updates and code clean-ups.
53
+
54
+
55
+Fixes since v2.0
56
+----------------
57
+
58
+Unless otherwise noted, all the fixes since v2.0 in the maintenance
59
+track are contained in this release (see the maintenance releases'
60
+notes for details).
61
+
62
+ * "--ignore-space-change" option of "git apply" ignored the spaces
63
+ at the beginning of line too aggressively, which is inconsistent
64
+ with the option of the same name "diff" and "git diff" have.
65
+ (merge 14d3bb4 jc/apply-ignore-whitespace later to maint).
66
+
67
+ * "git blame" miscounted number of columns needed to show localized
68
+ timestamps, resulting in jaggy left-side-edge of the source code
69
+ lines in its output.
70
+ (merge dd75553 jx/blame-align-relative-time later to maint).
71
+
72
+ * We used to disable threaded "git index-pack" on platforms without
73
+ thread-safe pread(); use a different workaround for such
74
+ platforms to allow threaded "git index-pack".
75
+ (merge 3953949 nd/index-pack-one-fd-per-thread later to maint).
76
+
77
+ * "git rerere forget" did not work well when merge.conflictstyle
78
+ was set to a non-default value.
79
+ (merge de3d8bb fc/rerere-conflict-style later to maint).
80
+
81
+ * "git status", even though it is a read-only operation, tries to
82
+ update the index with refreshed lstat(2) info to optimize future
83
+ accesses to the working tree opportunistically, but this could
84
+ race with a "read-write" operation that modify the index while it
85
+ is running. Detect such a race and avoid overwriting the index.
86
+ (merge 426ddee ym/fix-opportunistic-index-update-race later to maint).
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v2.0.0
4
+DEF_VER=v2.0.0.GIT
5
6
LF='
7
'
RelNotes
+1
-1
@@ -1 +1 @@
1
-Documentation/RelNotes/2.0.0.txt
\ No newline at end of file
1
+Documentation/RelNotes/2.1.0.txt
\ No newline at end of file