]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/RelNotes/1.6.1.1.txt
Merge branch 'js/maint-merge-one-file-osx-expr'
[thirdparty/git.git] / Documentation / RelNotes / 1.6.1.1.txt
CommitLineData
936b7057
JH
1GIT v1.6.1.1 Release Notes
2==========================
3
4Fixes since v1.6.1
5------------------
6
5c415311
JH
7* "git add frotz/nitfol" when "frotz" is a submodule should have errored
8 out, but it didn't.
9
eb475bfa
JH
10* "git apply" took file modes from the patch text and updated the mode
11 bits of the target tree even when the patch was not about mode changes.
12
5c415311
JH
13* "git bisect view" on Cygwin did not launch gitk
14
eb475bfa
JH
15* "git checkout $tree" did not trigger an error.
16
9d3043cf
JH
17* "git commit" tried to remove COMMIT_EDITMSG from the work tree by mistake.
18
936b7057
JH
19* "git describe --all" complained when a commit is described with a tag,
20 which was nonsense.
21
5c415311
JH
22* "git diff --no-index --" did not trigger no-index (aka "use git-diff as
23 a replacement of diff on untracked files") behaviour.
24
25* "git format-patch -1 HEAD" on a root commit failed to produce patch
26 text.
27
9d3043cf
JH
28* "git fsck branch" did not work as advertised; instead it behaved the same
29 way as "git fsck".
30
936b7057
JH
31* "git log --pretty=format:%s" did not handle a multi-line subject the
32 same way as built-in log listers (i.e. shortlog, --pretty=oneline, etc.)
33
34* "git daemon", and "git merge-file" are more careful when freopen fails
35 and barf, instead of going on and writing to unopened filehandle.
36
eb475bfa
JH
37* "git http-push" did not like some RFC 4918 compliant DAV server
38 responses.
39
40* "git merge -s recursive" mistakenly overwritten an untracked file in the
41 work tree upon delete/modify conflict.
42
43* "git merge -s recursive" didn't leave the index unmerged for entries with
c0bc2eeb 44 rename/delete conflicts.
eb475bfa
JH
45
46* "git merge -s recursive" clobbered untracked files in the work tree.
47
c0bc2eeb 48* "git mv -k" with more than one erroneous paths misbehaved.
eb475bfa 49
5c415311
JH
50* "git read-tree -m -u" hence branch switching incorrectly lost a
51 subdirectory in rare cases.
52
eb475bfa
JH
53* "git rebase -i" issued an unnecessary error message upon a user error of
54 marking the first commit to be "squash"ed.
55
5c415311
JH
56* "git shortlog" did not format a commit message with multi-line
57 subject correctly.
936b7057 58
5c415311 59Many documentation updates.