Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Fifth batch for post 2.8 cycle
author
Junio C Hamano
<gitster@pobox.com>
Mon, 18 Apr 2016 17:51:09 +0000
(10:51 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 18 Apr 2016 17:51:09 +0000
(10:51 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes/2.9.0.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (from parent 1:
f5cc612
)
diff --git
a/Documentation/RelNotes/2.9.0.txt
b/Documentation/RelNotes/2.9.0.txt
index 7bf95f8519110271cd11df0c7f75563bdf99f7a2..46bee4abac10a9209591e8fb042019009a6542ce 100644
(file)
--- a/
Documentation/RelNotes/2.9.0.txt
+++ b/
Documentation/RelNotes/2.9.0.txt
@@
-179,6
+179,11
@@
notes for details).
which was wrong.
(merge f292244 ky/branch-d-worktree later to maint).
which was wrong.
(merge f292244 ky/branch-d-worktree later to maint).
+ * When "git worktree" feature is in use, "git branch -m" renamed a
+ branch that is checked out in another worktree without adjusting
+ the HEAD symbolic ref for the worktree.
+ (merge 18eb3a9 ky/branch-m-worktree later to maint).
+
* "git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
* "git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.
@@
-201,6
+206,13
@@
notes for details).
corrected.
(merge a08feb8 tb/blame-force-read-cache-to-workaround-safe-crlf later to maint).
corrected.
(merge a08feb8 tb/blame-force-read-cache-to-workaround-safe-crlf later to maint).
+ * A change back in version 2.7 to "git branch" broke display of a
+ symbolic ref in a non-standard place in the refs/ hierarchy (we
+ expect symbolic refs to appear in refs/remotes/*/HEAD to point at
+ the primary branch the remote has, and as .git/HEAD to point at the
+ branch we locally checked out).
+ (merge 95c38fb jk/branch-shortening-funny-symrefs later to maint).
+
* Other minor clean-ups and documentation updates
(merge aed7480 mm/lockfile-error-message later to maint).
(merge bfee614 jc/index-pack later to maint).
* Other minor clean-ups and documentation updates
(merge aed7480 mm/lockfile-error-message later to maint).
(merge bfee614 jc/index-pack later to maint).