Third batch for post 2.8 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 8, 2016 at 14:34 UTC
7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355
1 file changed
+24
Documentation/RelNotes/2.9.0.txt
+24
@@ -8,6 +8,10 @@ The end-user facing Porcelain level commands in the "git diff" and
8
"git log" by default enables the rename detection; you can still use
9
"diff.renames" configuration variable to disable this.
10
11
+Merging two branches that have no common ancestor with "git merge" is
12
+by default forbidden now to prevent creating such an unusual merge by
13
+mistake.
14
+
15
16
Updates since v2.8
17
------------------
@@ -39,6 +43,21 @@ UI, Workflows & Features
43
configuration variable, tag.forceSignAnnotated, can be used to tell
44
the command to create signed tag in such a situation.
45
46
+ * "git merge" used to allow merging two branches that have no common
47
+ base by default, which led to a brand new history of an existing
48
+ project created and then get pulled by an unsuspecting maintainer,
49
+ which allowed an unnecessary parallel history merged into the
50
+ existing project. The command has been taught not to allow this by
51
+ default, with an escape hatch "--allow-unrelated-histories" option
52
+ to be used in a rare event that merges histories of two projects
53
+ that started their lives independently.
54
+ (merge e379fdf jc/merge-refuse-new-root later to maint).
55
+
56
+ * "git apply -v" learned to report paths in the patch that were
57
+ skipped via --include/--exclude mechanism or being outside the
58
+ current working directory.
59
+ (merge 3f57944 nd/apply-report-skip later to maint).
60
+
61
62
Performance, Internal Implementation, Development Support etc.
63
@@ -70,6 +89,8 @@ Performance, Internal Implementation, Development Support etc.
89
configuration in /etc/gitconfig to the tested environment.
90
(merge 1fad503 jk/test-httpd-config-nosystem later to maint).
91
92
+ * Build updates for MSVC.
93
+ (merge 0ef60af ss/msvc later to maint).
94
95
Also contains various documentation updates and code clean-ups.
96
@@ -131,3 +152,6 @@ notes for details).
152
(merge dde7891 pb/t7502-drop-dup later to maint).
153
(merge 3bd1b51 cc/doc-recommend-performance-trace-to-file later to maint).
154
(merge 7d5e9c9 jk/credential-cache-comment-exit later to maint).
155
+ (merge 16a86d4 nd/apply-doc later to maint).
156
+ (merge c3f6b85 pb/opt-cmdmode-doc later to maint).
157
+ (merge 30211fb oa/doc-diff-check later to maint).