mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-06 17:23:00 +01:00
Code Activity
32067 commits 6 branches 956 tags 492 MiB
Commit graph

174 commits

Author SHA1 Message Date
Junio C Hamano
167a5800cb Git 1.7.7-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-18 15:41:34 -07:00
Junio C Hamano
5738c9c21e Git 1.7.7-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-12 10:44:32 -07:00
Junio C Hamano
a452d148d1 Git 1.7.7-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-25 21:00:46 -07:00
Junio C Hamano
cf13f6ca40 Start 1.7.7 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-07-06 17:00:46 -07:00
Junio C Hamano
f696543dad Git 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-26 12:41:16 -07:00
Junio C Hamano
7af4fc9cf3 Git 1.7.6-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-22 16:13:16 -07:00
Junio C Hamano
302bd999fd Git 1.7.6-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-16 09:21:36 -07:00
Junio C Hamano
2cbd969bcf Git 1.7.6-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-08 18:29:48 -07:00
Junio C Hamano
e839fe6c12 Start 1.7.6 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-27 12:09:04 -07:00
Junio C Hamano
ec014eac0e Git 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-23 23:36:32 -07:00
Junio C Hamano
6ceb270ce6 Git 1.7.5-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-19 11:51:00 -07:00
Junio C Hamano
865d370c4d Git 1.7.5-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-13 14:02:00 -07:00
Junio C Hamano
6be0559183 Git 1.7.5-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-04-06 10:57:32 -07:00
Junio C Hamano
6acef04358 Git 1.7.5-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-31 13:58:47 -07:00
Junio C Hamano
7ed863a85a Git 1.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-30 19:02:37 -08:00
Junio C Hamano
adf872e783 Git 1.7.4-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-13 12:14:18 -08:00
Junio C Hamano
685e9d9145 Git 1.7.4-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-05 14:57:19 -08:00
Junio C Hamano
01b97a4cb6 Git 1.7.4-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-28 13:53:24 -08:00
Junio C Hamano
9855b08d35 Start 1.7.4 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-29 15:26:17 -07:00
Junio C Hamano
92c1e71777 Git 1.7.3.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-29 10:39:53 -07:00
Junio C Hamano
87b50542a0 Git 1.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-18 14:55:08 -07:00
Junio C Hamano
7e100effc6 Git 1.7.3 rc2 2010-09-15 12:47:37 -07:00
Junio C Hamano
3b3a8ed4be Git 1.7.3 rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-10 11:55:55 -07:00
Junio C Hamano
ba9523ea80 Sync with 1.7.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-07-27 16:55:05 -07:00
Junio C Hamano
2aedccd3d5 Git 1.7.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-07-27 16:42:53 -07:00
Junio C Hamano
64fdc08dac Git 1.7.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-07-21 12:55:50 -07:00
Junio C Hamano
0e4607c09d Merge branch 'maint' 
* maint:
  GIT-VERSION-GEN: restrict tags used
 2010-05-11 23:04:47 -07:00
Tay Ray Chuan
3368edd4cd GIT-VERSION-GEN: restrict tags used 
Restrict the tags used to generate the version string to those that
begin with "v", since git's tags for git-core (ie. excluding git-gui)
are all of the form "vX.Y...".

This is to avoid using private tags by the user in a clone of the git
code repository, which may break certain machinery (eg. Makefile, gitk).

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-05-11 23:04:23 -07:00
Junio C Hamano
212f0ba357 Start 1.7.2 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-05-08 22:58:36 -07:00
Junio C Hamano
d599e0484f Git 1.7.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-04-23 18:27:17 -07:00
Junio C Hamano
5469e2dab1 Git 1.7.1-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-04-18 22:19:04 -07:00
Junio C Hamano
7b575f3c38 Sync with 1.7.0.5 2010-04-11 13:46:08 -07:00
Junio C Hamano
fcd424011b Git 1.7.0.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-04-11 13:42:33 -07:00
Junio C Hamano
2be10bb5c1 Git 1.7.0.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-31 15:12:08 -07:00
Junio C Hamano
0b3dcfe721 Git 1.7.0.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-21 17:01:22 -07:00
Junio C Hamano
97222d9634 Git 1.7.0.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-07 11:07:51 -08:00
Junio C Hamano
c5e5f60305 Git 1.7.0.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-02-28 11:41:24 -08:00
Junio C Hamano
9b25048318 Start 1.7.0 maintenance track 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-02-13 15:04:00 -08:00
Junio C Hamano
e923eaeb90 Git 1.7.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-02-12 15:45:05 -08:00
Junio C Hamano
68b890a8d5 Kick off 1.7.0 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-12-26 14:11:46 -08:00
Junio C Hamano
902f235378 Git 1.6.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-12-23 12:23:11 -08:00
Junio C Hamano
ab0964d951 Git 1.6.6-rc4 
Hopefully the last rc before the final one.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-12-20 12:15:02 -08:00
Junio C Hamano
94058a90cf Git 1.6.6-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-12-16 12:50:33 -08:00
Junio C Hamano
80d93611c5 Git 1.6.6-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-12-09 16:21:36 -08:00
Junio C Hamano
b809d9cd07 Git 1.6.6-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-12-02 10:50:17 -08:00
Junio C Hamano
ad12b81271 Start 1.6.6 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-10-17 00:11:43 -07:00
Junio C Hamano
78d553b7d7 GIT 1.6.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-10-10 00:05:19 -07:00
Junio C Hamano
6641575963 Start 1.6.5 cycle 
The next major release will be 1.6.5, hopefully with a shorter cycle
than the 1.6.4 cycle.  After that in 1.7.0 we can make potentially
backward incompatible changes if necessary.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-07-29 09:33:29 -07:00
Junio C Hamano
0a53e9ddea GIT 1.6.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-07-29 00:32:42 -07:00
Junio C Hamano
f01f1099f4 GIT 1.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-05-06 18:16:40 -07:00
Junio C Hamano
a95148dea1 GIT 1.6.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-03-03 23:37:19 -08:00
Junio C Hamano
661763abf6 GIT 1.6.2-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-02-25 14:50:52 -08:00
Junio C Hamano
c42b1ad944 Sync with 1.6.1.1 2009-01-25 17:09:35 -08:00
Junio C Hamano
5c415311f7 GIT 1.6.1.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2009-01-25 12:41:09 -08:00
Junio C Hamano
97a7a82f19 GIT 1.6.0.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-09-12 16:18:47 -07:00
Junio C Hamano
ea02eef096 GIT 1.6.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-08-17 11:42:10 -07:00
Junio C Hamano
b13d44093b GIT-VERSION-GEN: mark the version 'dirty' only if there are modified files 
We used to mark the version string with '-dirty' if the cache was not up
to date, but the only thing we want to know is if the binaries are built
from modified source.  Refresh the cache to avoid false dirtyness.

Christian Jaeger noticed this issue while building under fakeroot
environment (without -u) that lies about the file ownership data.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-08-08 13:31:27 -07:00
Lea Wiemann
935e247e8c GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy 
Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-06-28 10:53:11 -07:00
Junio C Hamano
e449f10580 GIT 1.5.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-06-18 13:09:43 -07:00
Lars Hjemli
c48799e560 Teach GIT-VERSION-GEN about the .git file 
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-09 01:22:50 -07:00
Junio C Hamano
1d2375ddfe GIT 1.5.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-04-07 21:57:43 -07:00
Junio C Hamano
6c41b80153 GIT 1.5.5-rc3 
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-04-02 11:13:25 -07:00
Junio C Hamano
803d515812 GIT 1.5.5-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-03-27 20:43:51 -07:00
Junio C Hamano
f8dd64fdbf GIT 1.5.4.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-03-27 20:36:35 -07:00
Junio C Hamano
bc6100087c GIT 1.5.5-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-03-23 00:22:29 -07:00
Junio C Hamano
56d5fe2855 GIT 1.5.4.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-03-08 19:43:21 -08:00
Junio C Hamano
923d44aeb7 Sync with 1.5.4.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-02-23 11:49:34 -08:00
Junio C Hamano
31e0b2ca81 GIT 1.5.4.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-02-23 11:31:04 -08:00
Junio C Hamano
cf5c51efc9 Sync with 1.5.4.2 and start 1.5.5 Release Notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-02-17 01:51:46 -08:00
Junio C Hamano
e5fc9a0aea GIT 1.5.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-02-17 00:20:38 -08:00
Junio C Hamano
c3c135291a GIT 1.5.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-02-01 19:10:10 -08:00
Junio C Hamano
bf5aeb1506 GIT 1.5.4-rc5 
Hopefully the last rc before the final...

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-01-26 22:48:03 -08:00
Junio C Hamano
145d08248e GIT 1.5.4-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-01-11 21:40:55 -08:00
Junio C Hamano
bbff2dce2b GIT 1.5.4-rc2 
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-26 18:16:52 -08:00
Junio C Hamano
74f6b03c5c GIT 1.5.4-rc1 
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-19 17:24:04 -08:00
Junio C Hamano
1e8df762b3 GIT 1.5.4-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2007-12-12 17:48:21 -08:00
Junio C Hamano
1e61b7640d Start 1.5.4 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2007-09-03 02:40:06 -07:00
Junio C Hamano
5587cac28b GIT 1.5.3.1: obsolete git-p4 in RPM spec file. 
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-09-03 01:28:37 -07:00
Junio C Hamano
61c3f9086a GIT v1.5.3-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2007-07-12 14:54:33 -07:00
Junio C Hamano
f26cacf495 Merge branch 'maint' 
* maint:
  Unquote From line from patch before comparing with given from address.
  git-cherry: Document 'limit' command-line option
 2007-06-12 00:15:16 -07:00
Junio C Hamano
a6080a0a44 War on whitespace 
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-07 00:04:01 -07:00
Junio C Hamano
41cf68a85c GIT 1.5.2.1 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-06-02 16:02:49 -07:00
Junio C Hamano
aba170cdb4 GIT 1.5.2 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-05-20 00:30:39 -07:00
Junio C Hamano
843142ada0 GIT v1.5.2-rc3 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-05-10 15:22:02 -07:00
Junio C Hamano
9159afbfce GIT v1.5.2-rc2 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-05-06 01:07:04 -07:00
Junio C Hamano
4c16112494 GIT v1.5.2-rc1 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-04-30 17:30:02 -07:00
Junio C Hamano
b5cc62f701 GIT v1.5.1.3 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-04-30 17:09:48 -07:00
Junio C Hamano
97317061c6 GIT 1.5.1.2 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-04-21 13:57:07 -07:00
Junio C Hamano
9b11d24d41 GIT 1.5.1.1 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-04-11 17:19:36 -07:00
Junio C Hamano
89815cab95 GIT 1.5.1 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-04-03 22:47:01 -07:00
Junio C Hamano
7685227e97 GIT 1.5.1-rc3 2007-03-28 15:58:09 -07:00
Junio C Hamano
b6da18b1d1 GIT 1.5.1-rc2 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-03-25 18:01:50 -07:00
Junio C Hamano
ceb8442af7 GIT 1.5.1-rc1 
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-03-19 02:56:29 -07:00
Junio C Hamano
204d409247 GIT-VERSION-FILE: check ./version first. 
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-14 15:25:27 -08:00
Junio C Hamano
437b1b20df GIT 1.5.0 2007-02-14 00:00:00 +00:00
Junio C Hamano
5c553ea2de GIT v1.5.0-rc4 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-02-07 14:31:46 -08:00
Junio C Hamano
8c4e4ef0f5 GIT v1.5.0-rc3 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-01-31 15:41:49 -08:00
Junio C Hamano
eaf6459e4d GIT v1.5.0-rc2 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-01-20 23:44:55 -08:00
Junio C Hamano
ba70de01bb GIT v1.5.0-rc1 
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-01-11 18:22:48 -08:00
Junio C Hamano
d5e86da891 GIT v1.5.0 preview 
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-25 18:39:54 -08:00