diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-07 11:09:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 11:09:47 -0800 |
| commit | 1703169b5299ddbd68eb92cf8b5920838f444ba1 (patch) | |
| tree | f94637f5314bf948a24c9654b5ccc2ed1790ec9d | |
| parent | Merge branch 'maint' (diff) | |
| parent | Git 1.7.0.2 (diff) | |
| download | tgif-1703169b5299ddbd68eb92cf8b5920838f444ba1.tar.xz | |
Sync with 1.7.0.2
| -rw-r--r-- | Documentation/RelNotes-1.7.0.2.txt | 6 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/Documentation/RelNotes-1.7.0.2.txt b/Documentation/RelNotes-1.7.0.2.txt index e44e010c11..fcb46ca6a4 100644 --- a/Documentation/RelNotes-1.7.0.2.txt +++ b/Documentation/RelNotes-1.7.0.2.txt @@ -38,9 +38,3 @@ Fixes since v1.7.0.1 file. And other minor fixes and documentation updates. - ---- -exec >/var/tmp/1 -O=v1.7.0.1-64-g7d18122 -echo O=$(git describe maint) -git shortlog --no-merges $O..maint diff --git a/Documentation/git.txt b/Documentation/git.txt index 98b6e16982..35c0c7983d 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.0.1/git.html[documentation for release 1.7.0.1] +* link:v1.7.0.2/git.html[documentation for release 1.7.0.2] * release notes for + link:RelNotes-1.7.0.2.txt[1.7.0.2], link:RelNotes-1.7.0.1.txt[1.7.0.1], link:RelNotes-1.7.0.txt[1.7.0]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 7f894fdd46..d968ff0fcd 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.0.1 +DEF_VER=v1.7.0.2 LF=' ' diff --git a/t/test-lib.sh b/t/test-lib.sh index afd3053f96..a0e396a952 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -65,6 +65,8 @@ GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u} # CDPATH into the environment unset CDPATH +unset GREP_OPTIONS + case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in 1|2|true) echo "* warning: Some tests will not work if GIT_TRACE" \ |