diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-14 22:58:46 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-14 22:58:46 -0800 |
commit | b32acd21d81ac792cf28d487b960a2f6bb0ef0e2 (patch) | |
tree | 0d12b7b48f2a42dda239f385c96f8fe880d2a065 /Documentation | |
parent | 3cf3b838c7b379824c68ee87799aaaa9028b36cd (diff) | |
parent | eb475bfa05dc77462c02ef403d7be5faadf8e64f (diff) | |
download | git-b32acd21d81ac792cf28d487b960a2f6bb0ef0e2.tar.gz git-b32acd21d81ac792cf28d487b960a2f6bb0ef0e2.tar.xz |
Merge branch 'maint'
* maint:
Update draft release notes to 1.6.1.1
Make t3411 executable
fix handling of multiple untracked files for git mv -k
add test cases for "git mv -k"
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 |