File tree Expand file tree Collapse file tree 1 file changed +23
-2
lines changed Expand file tree Collapse file tree 1 file changed +23
-2
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,11 @@ GIT v1.6.1.1 Release Notes
4
4
Fixes since v1.6.1
5
5
------------------
6
6
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
+
7
12
* "git describe --all" complained when a commit is described with a tag,
8
13
which was nonsense.
9
14
@@ -13,11 +18,27 @@ Fixes since v1.6.1
13
18
* "git daemon", and "git merge-file" are more careful when freopen fails
14
19
and barf, instead of going on and writing to unopened filehandle.
15
20
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.
17
38
18
39
---
19
40
exec >/var/tmp/1
20
- O=v1.6.1-15-ga9e67c8
41
+ O=v1.6.1-47-g914186a
21
42
echo O=$(git describe maint)
22
43
git shortlog --no-merges $O..maint
23
44
You can’t perform that action at this time.
0 commit comments