kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Sync with 1.6.1.1

maint
Junio C Hamano 2009-01-25 16:30:13 -08:00
parent d6716c0266 5c415311f7
commit c42b1ad944
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Documentation/RelNotes-1.6.1.1.txt
View File

@ -4,9 +4,14 @@ GIT v1.6.1.1 Release Notes
Fixes since v1.6.1 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 * "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. 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 checkout $tree" did not trigger an error.


* "git commit" tried to remove COMMIT_EDITMSG from the work tree by mistake. * "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, * "git describe --all" complained when a commit is described with a tag,
which was nonsense. 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 * "git fsck branch" did not work as advertised; instead it behaved the same
way as "git fsck". way as "git fsck".


@ -36,14 +47,13 @@ Fixes since v1.6.1


* "git mv -k" with more than one errorneous paths misbehaved. * "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 * "git rebase -i" issued an unnecessary error message upon a user error of
marking the first commit to be "squash"ed. marking the first commit to be "squash"ed.


Other documentation updates. * "git shortlog" did not format a commit message with multi-line

subject correctly.
---
exec >/var/tmp/1
O=v1.6.1-60-g78f111e
echo O=$(git describe maint)
git shortlog --no-merges $O..maint


Many documentation updates.

3
Documentation/git.txt
View File

@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: 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 * release notes for
link:RelNotes-1.6.1.1.txt[1.6.1.1],
link:RelNotes-1.6.1.txt[1.6.1]. link:RelNotes-1.6.1.txt[1.6.1].


* link:v1.6.0.6/git.html[documentation for release 1.6.0.6] * link:v1.6.0.6/git.html[documentation for release 1.6.0.6]

2
GIT-VERSION-GEN
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh


GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.6.0.2.GIT DEF_VER=v1.6.1.GIT


LF=' LF='
' '