From be1b0558777dafa7b8993bc371cbe4078350e4e9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 2 Dec 2010 11:23:50 -0800 Subject: [PATCH 1/3] Documentation: Fix mark-up of lines with more than one tilde The manual pages of cherry-pick and revert had examples with two revisions on the same line in the examples section, that looked like this: git cherry-pick master~4 master~2:: Unfortunately, this is taken as a mark-up to make the part between two tildes, "4 master", subscript. Use {tilde} to make it explicit that we do want ~ characters in these places (backslash does not help). Reported-by: Sylvain Rabot Helped-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-cherry-pick.txt | 2 +- Documentation/git-revert.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 3c96fa8c86..73008705eb 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -92,7 +92,7 @@ git cherry-pick ^HEAD master:: Apply the changes introduced by all commits that are ancestors of master but not of HEAD to produce new commits. -git cherry-pick master\~4 master~2:: +git cherry-pick master{tilde}4 master{tilde}2:: Apply the changes introduced by the fifth and third last commits pointed to by master and create 2 new commits with diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index f40984d144..752fc88e76 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -87,7 +87,7 @@ git revert HEAD~3:: Revert the changes specified by the fourth last commit in HEAD and create a new commit with the reverted changes. -git revert -n master\~5..master~2:: +git revert -n master{tilde}5..master{tilde}2:: Revert the changes done by commits from the fifth last commit in master (included) to the third last commit in master From cbcab75c54b5956dcaa4f24a4074bc99adc49629 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 2 Dec 2010 12:06:06 -0800 Subject: [PATCH 2/3] Git 1.7.0.8 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.0.8.txt | 10 ++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/1.7.0.8.txt diff --git a/Documentation/RelNotes/1.7.0.8.txt b/Documentation/RelNotes/1.7.0.8.txt new file mode 100644 index 0000000000..7f05b48e17 --- /dev/null +++ b/Documentation/RelNotes/1.7.0.8.txt @@ -0,0 +1,10 @@ +Git v1.7.0.8 Release Notes +========================== + +This is primarily to backport support for the new "add.ignoreErrors" +name given to the existing "add.ignore-errors" configuration variable. + +The next version, Git 1.7.4, and future versions, will support both +old and incorrect name and the new corrected name, but without this +backport, users who want to use the new name "add.ignoreErrors" in +their repositories cannot use older versions of Git. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 6a3f945636..4149fa9eb7 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.0.7 +DEF_VER=v1.7.0.8 LF=' ' diff --git a/RelNotes b/RelNotes index c150f36749..882532b048 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.7.0.7.txt \ No newline at end of file +Documentation/RelNotes/1.7.0.8.txt \ No newline at end of file From 1c2ab4303354da23ff74ce2ea4a99b69fcfae825 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 2 Dec 2010 14:33:26 -0800 Subject: [PATCH 3/3] Update draft release notes to 1.7.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.4.txt | 47 +++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt index 9f946e218d..0a73e6dc0f 100644 --- a/Documentation/RelNotes/1.7.4.txt +++ b/Documentation/RelNotes/1.7.4.txt @@ -15,9 +15,21 @@ Updates since v1.7.3 /etc/gitattributes; core.attributesfile configuration variable can be used to customize the path to this file. + * The thread structure generated by "git send-email" has changed + slightly. Setting the cover letter of the latest series as a reply + to the cover letter of the previous series with --in-reply-to used + to make the new cover letter and all the patches replies to the + cover letter of the previous series; this has been changed to make + the patches in the new series replies to the new cover letter. + * Bash completion script in contrib/ has been adjusted to be also usable by zsh. + * "git blame" learned --show-email option to display the e-mail + addresses instead of the names of authors. + + * "git daemon" can be built in MinGW environment. + * "git daemon" can take more than one --listen option to listen to multiple addresses. @@ -41,6 +53,13 @@ Updates since v1.7.3 * "git merge --log" used to limit the resulting merge log to 20 entries; this is now customizable by giving e.g. "--log=47". + * "git merge" may work better when all files were moved out of a + directory in one branch while a new file is created in place of that + directory in the other branch. + + * "git rebase --autosquash" can use SHA-1 object names to name which + commit to fix up (e.g. "fixup! e83c5163"). + * The default "recursive" merge strategy learned --rename-threshold option to influence the rename detection, similar to the -M option of "git diff". E.g. "git merge -Xrename-threshold=50% ..." to use @@ -73,33 +92,41 @@ Fixes since v1.7.3 All of the fixes in v1.7.3.X maintenance series are included in this release, unless otherwise noted. - * "diff" and friends incorrectly applied textconv filters to symlinks - (d391c0ff). + * Smart HTTP transport used to incorrectly retry redirected POST + request with GET request (311e2ea006). - * "git apply" segfaulted when a bogus input is fed to it (24305cd70). + * "git apply" did not correctly handle patches that only change modes + if told to apply while stripping leading paths with -p option (aae1f6ac). - * Running "git cherry-pick --ff" on a root commit segfaulted (6355e50). + * "git apply" can deal with patches with timezone formatted with a + colon between the hours and minutes part (e.g. "-08:00" instead of + "-0800"). + + * "git checkout" removed an untracked file "foo" from the working + tree when switching to a branch that contains a tracked path + "foo/bar". Prevent this, just like the case where the conflicting + path were "foo" (c752e7f..7980872d). + + * "git diff --check" reported an incorrect line number for added + blank lines at the end of file (8837d335). * "git log --author=me --author=her" did not find commits written by me or by her; instead it looked for commits written by me and by her, which is impossible. - * "git merge-file" can be called from within a subdirectory now - (55846b9a). + * "git merge" into an unborn branch removed an untracked file "foo" + from the working tree when merged branch had "foo" (2caf20c..172b642). * "git push --progress" shows progress indicators now. * "git repack" places its temporary packs under $GIT_OBJECT_DIRECTORY/pack instead of $GIT_OBJECT_DIRECTORY/ to avoid cross directory renames. - * "git rev-list --format="...%x00..." incorrectly chopped its output - at NUL (9130ac9fe). - * "git submodule update --recursive --other-flags" passes flags down to its subinvocations. --- exec >/var/tmp/1 -O=v1.7.3.2-245-g03276d9 +O=v1.7.3.2-450-g5b9c331 echo O=$(git describe master) git shortlog --no-merges ^maint ^$O master