summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
AgeCommit message (Collapse)AuthorFilesLines
2008-04-09Teach GIT-VERSION-GEN about the .git fileLibravatar Lars Hjemli1-1/+1
The presence of a .git directory used to be good enough evidence that GIT-VERSION-GEN could use 'git describe' to get a version number. But now .git might as well be a file so the test must be extended to cater for such setups. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-07GIT 1.5.5Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-02GIT 1.5.5-rc3Libravatar Junio C Hamano1-1/+1
The rate of fixes that trickle in has slowed and we are definitely getting there. Hopefully one final round and we will have the final 1.5.5 soon. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-27GIT 1.5.5-rc2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-27GIT 1.5.4.5Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-23GIT 1.5.5-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-08GIT 1.5.4.4Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-23Sync with 1.5.4.3Libravatar Junio C Hamano1-1/+2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-23GIT 1.5.4.3Libravatar Junio C Hamano1-2/+3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-17Sync with 1.5.4.2 and start 1.5.5 Release NotesLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-17GIT 1.5.4.2Libravatar Junio C Hamano1-10/+3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-01GIT 1.5.4Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-01-26GIT 1.5.4-rc5Libravatar Junio C Hamano1-1/+1
Hopefully the last rc before the final... Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-01-11GIT 1.5.4-rc3Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-12-26GIT 1.5.4-rc2Libravatar Junio C Hamano1-1/+1
Although everybody was quiet during the Christmas holiday, it's been a week since -rc1, so here is -rc2. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-12-19GIT 1.5.4-rc1Libravatar Junio C Hamano1-1/+1
It's been a week since -rc0, and we have quite a lot of fixes, so here it is. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-12-12GIT 1.5.4-rc0Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-09-03Start 1.5.4 cycleLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-09-03GIT 1.5.3.1: obsolete git-p4 in RPM spec file.Libravatar Junio C Hamano1-1/+1
HPA noticed that yum does not like the newer git RPM set; it turns out that we do not ship git-p4 anymore but existing installations do not realize the package is gone if we do not tell anything about it. David Kastrup suggests using Obsoletes in the spec file of the new RPM to replace the old package, so here is a try. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-12GIT v1.5.3-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-12Merge branch 'maint'Libravatar Junio C Hamano1-0/+2
* maint: Unquote From line from patch before comparing with given from address. git-cherry: Document 'limit' command-line option
2007-06-07War on whitespaceLibravatar Junio C Hamano1-2/+0
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-02GIT 1.5.2.1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-20GIT 1.5.2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-10GIT v1.5.2-rc3Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-06GIT v1.5.2-rc2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-30GIT v1.5.2-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-30GIT v1.5.1.3Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-21GIT 1.5.1.2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-11GIT 1.5.1.1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-03GIT 1.5.1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-28GIT 1.5.1-rc3Libravatar Junio C Hamano1-1/+1
2007-03-25GIT 1.5.1-rc2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-19GIT 1.5.1-rc1Libravatar Junio C Hamano1-1/+1
I think we can start to slow down, as we now have covered everything I listed earlier in the short-term release plan. The last release 1.5.0 took painfully too long. Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-14GIT-VERSION-FILE: check ./version first.Libravatar Junio C Hamano1-10/+11
When somebody else extracts git tarball inside a larger project, 'git describe' would reported the version number of that upper level project. Sometimes, using the consistent versioning across subdirectories of a larger project is useful, but it may not always be the right thing to do. This changes the script to check ./vertion file first, and then fall back to "git describe". This way, by default, tarball distribution will get our own version. If the upper level wants to use consistent versioning across its subdirectories, its Makefile can overwrite ./version file to force whatever version number they want to give us before descending into us. Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-14GIT 1.5.0Libravatar Junio C Hamano1-1/+1
2007-02-07GIT v1.5.0-rc4Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-31GIT v1.5.0-rc3Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-20GIT v1.5.0-rc2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-11GIT v1.5.0-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-12-25GIT v1.5.0 previewLibravatar Junio C Hamano1-1/+1
This is not yet -rc1 where all new topics closes, but I think it is getting pretty closer. I'd still want to merge updates to fsck/prune to honor reflog entries before -rc1. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-12-20Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
* maint: GIT 1.4.4.3
2006-12-20GIT 1.4.4.3Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-22GIT 1.4.4.1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-14GIT 1.4.4Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-11GIT 1.4.4-rc2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-07GIT 1.4.3-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-01GIT 1.4.3-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-08GIT-VERSION-GEN: adjust for ancient gitLibravatar Junio C Hamano1-1/+9
When an ancient "git" that does not understand "describe" command is on the $PATH, "git describe" emitted a Usage message without exiting non-zero status (which is a mistake we cannot fix retroactively). Catch this case to make sure we do not try using phoney multi-line string as a version number. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-03GIT 1.4.2-rc3Libravatar Junio C Hamano1-1/+1
We ended up merging too many stuff after -rc2, so here is another round of release candidate. Non bugfixes will be queued to "next" from now on until a real 1.4.2 happens. Signed-off-by: Junio C Hamano <junkio@cox.net>