diff options
| -rw-r--r-- | Documentation/RelNotes/1.7.4.txt | 7 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt index 375fea1..055c1ca 100644 --- a/Documentation/RelNotes/1.7.4.txt +++ b/Documentation/RelNotes/1.7.4.txt @@ -52,6 +52,11 @@ Updates since v1.7.3 * "git commit" learned --fixup and --squash options to help later invocation of the interactive rebase. + * Command line options to "git cvsimport" whose names are in capital + letters (-A, -M, -R and -S) can now be specified as the default in + the .git/config file by their longer names (cvsimport.authorsFile, + cvsimport.mergeRegex, cvsimport.trackRevisions, cvsimport.ignorePaths). + * "git daemon" can be built in MinGW environment. * "git daemon" can take more than one --listen option to listen to @@ -141,6 +146,6 @@ release, unless otherwise noted. --- exec >/var/tmp/1 -O=v1.7.3.4-687-g2cd900f +O=v1.7.4-rc1 echo O=$(git describe master) git shortlog --no-merges ^maint ^$O master diff --git a/Documentation/git.txt b/Documentation/git.txt index 72e98aa..4e5fe4d 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,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.3.4/git.html[documentation for release 1.7.3.4] +* link:v1.7.3.5/git.html[documentation for release 1.7.3.5] * release notes for + link:RelNotes/1.7.3.5.txt[1.7.3.5], link:RelNotes/1.7.3.4.txt[1.7.3.4], link:RelNotes/1.7.3.3.txt[1.7.3.3], link:RelNotes/1.7.3.2.txt[1.7.3.2], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 2b5133a..c29b944 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.4-rc0 +DEF_VER=v1.7.4-rc1 LF=' ' |