From 8024d5961bf885245d8febcb189a8c71bb46b29f Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 4 Mar 2010 13:08:28 +0100 Subject: Remove extra '-' from git-am(1) Signed-off-by: Michal Sojka Signed-off-by: Junio C Hamano diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 67ad5da..40178be 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -44,7 +44,7 @@ OPTIONS Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). ----no-scissors:: +--no-scissors:: Ignore scissors lines (see linkgit:git-mailinfo[1]). -q:: -- cgit v0.10.2-6-g49f6 From 3609ad8ec204f337f6fe12b3487b57e0d40c0d88 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 4 Mar 2010 22:39:38 -0800 Subject: Update draft release notes to 1.7.0.2 Signed-off-by: Junio C Hamano diff --git a/Documentation/RelNotes-1.7.0.2.txt b/Documentation/RelNotes-1.7.0.2.txt index 5f8e156..e44e010 100644 --- a/Documentation/RelNotes-1.7.0.2.txt +++ b/Documentation/RelNotes-1.7.0.2.txt @@ -4,19 +4,43 @@ Git v1.7.0.2 Release Notes Fixes since v1.7.0.1 -------------------- + * GIT_PAGER was not honored consistently by some scripted Porcelains, most + notably "git am". + + * updating working tree files after telling git to add them to the + index and while it is still working created garbage object files in + the repository without diagnosing it as an error. + + * "git bisect -- pathspec..." did not diagnose an error condition properly when + the simplification with given pathspec made the history empty. + + * "git rev-list --cherry-pick A...B" now has an obvious optimization when the + histories haven't diverged (i.e. when one end is an ancestor of the other). + + * "git diff --quiet -w" did not work as expected. + * "git fast-import" didn't work with a large input, as it lacked support for producing the pack index in v2 format. * "git imap-send" didn't use CRLF line endings over the imap protocol when storing its payload to the draft box, violating RFC 3501. + * "git log --format='%w(x,y,z)%b'" and friends that rewrap message + has been optimized for utf-8 payload. + * Error messages generated on the receiving end did not come back to "git push". + * "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series + to speed up scanning of large working tree. + + * "gitweb" did not diagnose parsing errors properly while reading tis configuration + file. + And other minor fixes and documentation updates. --- exec >/var/tmp/1 -O=v1.7.0.1-28-gb46946a +O=v1.7.0.1-64-g7d18122 echo O=$(git describe maint) git shortlog --no-merges $O..maint -- cgit v0.10.2-6-g49f6