diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-25 16:30:13 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-25 17:09:35 -0800 |
commit | c42b1ad944413ac8978f166dbb98bcd4716ef551 (patch) | |
tree | f11a9705e238ec1200b1187c5b9b299952d7ed33 | |
parent | Ignore test-ctype (diff) | |
parent | GIT 1.6.1.1 (diff) | |
download | tgif-c42b1ad944413ac8978f166dbb98bcd4716ef551.tar.xz |
Sync with 1.6.1.1
-rw-r--r-- | Documentation/RelNotes-1.6.1.1.txt | 24 | ||||
-rw-r--r-- | Documentation/git.txt | 3 | ||||
-rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 20 insertions, 9 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/Documentation/git.txt b/Documentation/git.txt index 17dc8b2019..cd527c6252 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.6.1/git.html[documentation for release 1.6.1] +* link:v1.6.1.1/git.html[documentation for release 1.6.1.1] * release notes for + link:RelNotes-1.6.1.1.txt[1.6.1.1], link:RelNotes-1.6.1.txt[1.6.1]. * link:v1.6.0.6/git.html[documentation for release 1.6.0.6] diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 6c7465c758..9c9fe640fb 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.GIT LF=' ' |