Fifth batch for post 2.8 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 18, 2016 at 10:51 UTC
e6ac6e1f7d54584c2b03f073b5f329a37f4a9561
1 file changed
+12
Documentation/RelNotes/2.9.0.txt
+12
@@ -179,6 +179,11 @@ notes for details).
179
which was wrong.
180
(merge f292244 ky/branch-d-worktree later to maint).
181
182
+ * When "git worktree" feature is in use, "git branch -m" renamed a
183
+ branch that is checked out in another worktree without adjusting
184
+ the HEAD symbolic ref for the worktree.
185
+ (merge 18eb3a9 ky/branch-m-worktree later to maint).
186
+
187
* "git diff -M" used to work better when two originally identical
188
files A and B got renamed to X/A and X/B by pairing A to X/A and B
189
to X/B, but this was broken in the 2.0 timeframe.
@@ -201,6 +206,13 @@ notes for details).
206
corrected.
207
(merge a08feb8 tb/blame-force-read-cache-to-workaround-safe-crlf later to maint).
208
209
+ * A change back in version 2.7 to "git branch" broke display of a
210
+ symbolic ref in a non-standard place in the refs/ hierarchy (we
211
+ expect symbolic refs to appear in refs/remotes/*/HEAD to point at
212
+ the primary branch the remote has, and as .git/HEAD to point at the
213
+ branch we locally checked out).
214
+ (merge 95c38fb jk/branch-shortening-funny-symrefs later to maint).
215
+
216
* Other minor clean-ups and documentation updates
217
(merge aed7480 mm/lockfile-error-message later to maint).
218
(merge bfee614 jc/index-pack later to maint).