diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-25 12:41:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-25 12:41:09 -0800 |
| commit | 5c415311f743ccb11a50f350ff1c385778f049d6 (patch) | |
| tree | 3e12474d32f2342a357c5839b4e4df35d6a33e56 | |
| parent | Merge branch 'cb/maint-unpack-trees-absense' into maint (diff) | |
| download | tgif-5c415311f743ccb11a50f350ff1c385778f049d6.tar.xz | |
GIT 1.6.1.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes-1.6.1.1.txt | 24 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 18 insertions, 8 deletions
diff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt index 5cd1ca9cc6..88454c1973 100644 --- a/Documentation/RelNotes-1.6.1.1.txt +++ b/Documentation/RelNotes-1.6.1.1.txt @@ -4,9 +4,14 @@ GIT v1.6.1.1 Release Notes Fixes since v1.6.1 ------------------ +* "git add frotz/nitfol" when "frotz" is a submodule should have errored + out, but it didn't. + * "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 bisect view" on Cygwin did not launch gitk + * "git checkout $tree" did not trigger an error. * "git commit" tried to remove COMMIT_EDITMSG from the work tree by mistake. @@ -14,6 +19,12 @@ Fixes since v1.6.1 * "git describe --all" complained when a commit is described with a tag, which was nonsense. +* "git diff --no-index --" did not trigger no-index (aka "use git-diff as + a replacement of diff on untracked files") behaviour. + +* "git format-patch -1 HEAD" on a root commit failed to produce patch + text. + * "git fsck branch" did not work as advertised; instead it behaved the same way as "git fsck". @@ -36,14 +47,13 @@ Fixes since v1.6.1 * "git mv -k" with more than one errorneous paths misbehaved. +* "git read-tree -m -u" hence branch switching incorrectly lost a + subdirectory in rare cases. + * "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-60-g78f111e -echo O=$(git describe maint) -git shortlog --no-merges $O..maint +* "git shortlog" did not format a commit message with multi-line + subject correctly. +Many documentation updates. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 6c7465c758..fe496e5fca 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.0.2.GIT +DEF_VER=v1.6.1.1.GIT LF=' ' |