diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-14 22:43:04 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-14 22:43:04 -0800 |
commit | eb475bfa05dc77462c02ef403d7be5faadf8e64f (patch) | |
tree | a76b3abbce1a7ce0fcbc4557afa540f5de8a70a1 /Documentation | |
parent | 914186a5c3dd687ad157dbda1518a58b58797391 (diff) | |
download | git-eb475bfa05dc77462c02ef403d7be5faadf8e64f.tar.gz git-eb475bfa05dc77462c02ef403d7be5faadf8e64f.tar.xz |
Update draft release notes to 1.6.1.1
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/RelNotes-1.6.1.1.txt | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt index 10b38e6ec..cff0d8b98 100644 --- a/Documentation/RelNotes-1.6.1.1.txt +++ b/Documentation/RelNotes-1.6.1.1.txt @@ -4,6 +4,11 @@ GIT v1.6.1.1 Release Notes Fixes since v1.6.1 ------------------ +* "git apply" took file modes from the patch text and updated the mode + bits of the target tree even when the patch was not about mode changes. + +* "git checkout $tree" did not trigger an error. + * "git describe --all" complained when a commit is described with a tag, which was nonsense. @@ -13,11 +18,27 @@ Fixes since v1.6.1 * "git daemon", and "git merge-file" are more careful when freopen fails and barf, instead of going on and writing to unopened filehandle. -Other documentation fixes. +* "git http-push" did not like some RFC 4918 compliant DAV server + responses. + +* "git merge -s recursive" mistakenly overwritten an untracked file in the + work tree upon delete/modify conflict. + +* "git merge -s recursive" didn't leave the index unmerged for entries with + rename/delete conflictd. + +* "git merge -s recursive" clobbered untracked files in the work tree. + +* "git mv -k" with more than one errorneous paths misbehaved. + +* "git rebase -i" issued an unnecessary error message upon a user error of + marking the first commit to be "squash"ed. + +Other documentation updates. --- exec >/var/tmp/1 -O=v1.6.1-15-ga9e67c8 +O=v1.6.1-47-g914186a echo O=$(git describe maint) git shortlog --no-merges $O..maint |