* git-diff --check now checks leftover merge conflict markers.
* "git-diff -p" learned to grab a better hunk header lines in
- Pascal/Delphi and Ruby source files, and also pays attention to
+ BibTex, Pascal/Delphi, and Ruby files and also pays attention to
chapter and part boundary in TeX documents.
* When remote side used to have branch 'foo' and git-fetch finds that now
All of the fixes in v1.5.6 maintenance series are included in
this release, unless otherwise noted.
-* git-clone ignored its -u option; the fix needs to be backported to
- 'maint';
+ * git-clone ignored its -u option; the fix needs to be backported to
+ 'maint';
-* git-mv used to lose the distinction between changes that are staged
- and that are only in the working tree, by staging both in the index
- after moving such a path.
+ * git-mv used to lose the distinction between changes that are staged
+ and that are only in the working tree, by staging both in the index
+ after moving such a path.
+
+ * "git-rebase -i -p" rewrote the parents to wrong ones when amending
+ (either edit or squash) was involved, and did not work correctly
+ when fast forwarding.
----
-exec >/var/tmp/1
-O=v1.6.0-rc2-21-g0bb3a0b
-echo O=$(git describe refs/heads/master)
-git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint