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/2] 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 3c96fa8c8..73008705e 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 f40984d14..752fc88e7 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/2] 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 000000000..7f05b48e1 --- /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 6a3f94563..4149fa9eb 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 c150f3674..882532b04 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