Skip to content

Commit eb475bf

Browse files
committed
Update draft release notes to 1.6.1.1
1 parent 914186a commit eb475bf

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

Documentation/RelNotes-1.6.1.1.txt

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ GIT v1.6.1.1 Release Notes
44
Fixes since v1.6.1
55
------------------
66

7+
* "git apply" took file modes from the patch text and updated the mode
8+
bits of the target tree even when the patch was not about mode changes.
9+
10+
* "git checkout $tree" did not trigger an error.
11+
712
* "git describe --all" complained when a commit is described with a tag,
813
which was nonsense.
914

@@ -13,11 +18,27 @@ Fixes since v1.6.1
1318
* "git daemon", and "git merge-file" are more careful when freopen fails
1419
and barf, instead of going on and writing to unopened filehandle.
1520

16-
Other documentation fixes.
21+
* "git http-push" did not like some RFC 4918 compliant DAV server
22+
responses.
23+
24+
* "git merge -s recursive" mistakenly overwritten an untracked file in the
25+
work tree upon delete/modify conflict.
26+
27+
* "git merge -s recursive" didn't leave the index unmerged for entries with
28+
rename/delete conflictd.
29+
30+
* "git merge -s recursive" clobbered untracked files in the work tree.
31+
32+
* "git mv -k" with more than one errorneous paths misbehaved.
33+
34+
* "git rebase -i" issued an unnecessary error message upon a user error of
35+
marking the first commit to be "squash"ed.
36+
37+
Other documentation updates.
1738

1839
---
1940
exec >/var/tmp/1
20-
O=v1.6.1-15-ga9e67c8
41+
O=v1.6.1-47-g914186a
2142
echo O=$(git describe maint)
2243
git shortlog --no-merges $O..maint
2344

0 commit comments

Comments
 (0)