mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-07 17:53:12 +01:00
Code Activity
28069 commits 6 branches 956 tags 494 MiB
Commit graph

227 commits

Author SHA1 Message Date
Junio C Hamano
e443bdfe1e Sync with v1.7.8.1 2011-12-21 12:02:44 -08:00
Junio C Hamano
2ce0edcd78 Git 1.7.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-21 12:02:13 -08:00
Junio C Hamano
876a6f4991 Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-19 16:39:54 -08:00
Junio C Hamano
ee22802493 Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-16 22:45:03 -08:00
Junio C Hamano
10f4eb652e Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 23:09:27 -08:00
Junio C Hamano
9e6324c4d7 Merge branch 'maint' 
* maint:
  Update draft release notes for 1.7.8.1
  Git 1.7.7.5
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf

Conflicts:
	RelNotes
 2011-12-13 22:18:00 -08:00
Junio C Hamano
7b6c5836cf Update draft release notes for 1.7.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 22:08:52 -08:00
Junio C Hamano
8311158c66 Merge branch 'maint-1.7.7' into maint 
* maint-1.7.7:
  Git 1.7.7.5
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf
  checkout,merge: loosen overwriting untracked file check based on info/exclude
  cast variable in call to free() in builtin/diff.c and submodule.c
  apply: get rid of useless x < 0 comparison on a size_t type

Conflicts:
	Documentation/git.txt
	GIT-VERSION-GEN
	RelNotes
	builtin/fetch.c
 2011-12-13 21:58:51 -08:00
Junio C Hamano
66c11f02b0 Git 1.7.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 21:55:31 -08:00
Junio C Hamano
7857e3246f Merge branch 'maint-1.7.6' into maint-1.7.7 
* maint-1.7.6:
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf

Conflicts:
	Documentation/git.txt
	GIT-VERSION-GEN
	RelNotes
 2011-12-13 21:44:56 -08:00
Junio C Hamano
15b7898c5e Git 1.7.6.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-13 21:32:30 -08:00
Junio C Hamano
9859a023fe Update draft release notes for 1.7.9 
The first two of more important topics slated for 1.7.9 have been merged.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-09 13:52:39 -08:00
Junio C Hamano
7e02a6c63a Kick-off the 1.7.9 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-05 15:49:34 -08:00
Junio C Hamano
406da78032 Git 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-02 10:02:52 -08:00
Junio C Hamano
fc14b89a7e Git 1.7.8-rc4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-28 14:07:22 -08:00
Junio C Hamano
017d1e1345 Update 1.7.8 draft release notes in preparation for rc4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-22 18:23:36 -08:00
Junio C Hamano
f56ef114ee Hopefully final update of release notes before 1.7.8 final 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-18 14:19:45 -08:00
Junio C Hamano
4c00c852b3 Sync with 1.7.7.4 2011-11-18 11:30:02 -08:00
Junio C Hamano
bd5bce7cbc Git 1.7.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-18 11:28:05 -08:00
Junio C Hamano
4d2440fe0d Git 1.7.8-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-17 11:06:15 -08:00
Junio C Hamano
bc1bbe0c19 Git 1.7.8-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-12 22:14:53 -08:00
Junio C Hamano
8a04247896 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-08 16:42:33 -08:00
Junio C Hamano
14ba45a2e6 Sync with 1.7.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-08 16:38:14 -08:00
Junio C Hamano
d4d5ab4727 Git 1.7.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-08 16:37:00 -08:00
Junio C Hamano
4cb6764227 Git 1.7.8-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-07 16:48:34 -08:00
Junio C Hamano
87bf9a7048 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-01 16:44:57 -07:00
Junio C Hamano
79eec363d2 Sync with 1.7.7.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-01 16:43:50 -07:00
Junio C Hamano
8d19b44b31 Git 1.7.7.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-11-01 16:41:57 -07:00
Junio C Hamano
be3fa9125e Git 1.7.8-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-30 19:14:24 -07:00
Junio C Hamano
e8e1c29021 Update draft release notes to 1.7.8 
Getting very close to -rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-27 12:06:44 -07:00
Junio C Hamano
425c771534 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-26 16:23:26 -07:00
Junio C Hamano
10b2a48113 Merge branch 'maint' 
* maint:
  Git 1.7.7.1
  RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting

Conflicts:
	GIT-VERSION-GEN
 2011-10-23 21:49:14 -07:00
Jonathan Nieder
7fe74f52f9 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting 
The change was actually about "git init -s" which sets the setgid bit on
SysV-style systems to allow shared access to a repository, and can provoke
errors on BSD-style systems, depending on how permissive the filesystem in
use wants to be.

More to the point, the patch was just taking a fix that arrived for
FreeBSD in v1.5.5 days and making it also apply to machines using an
(obscure) GNU userland/FreeBSD kernel mixture.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-23 21:16:31 -07:00
Junio C Hamano
e454a83fa2 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-21 16:05:42 -07:00
Junio C Hamano
8963314c77 Sync with maint 2011-10-21 11:24:34 -07:00
Junio C Hamano
8742218f21 Almost ready for 1.7.7.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-21 11:01:07 -07:00
Junio C Hamano
87009edcbd Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-19 11:02:13 -07:00
Junio C Hamano
08cfdbb88c Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-17 22:08:25 -07:00
Junio C Hamano
05f6edcd2a Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-16 10:58:35 -07:00
Junio C Hamano
288396994f Sync with maint 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-15 20:59:50 -07:00
Junio C Hamano
16b3b2d969 Prepare for 1.7.7.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-15 20:55:12 -07:00
Junio C Hamano
c9e7aa4f68 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-13 22:18:04 -07:00
Junio C Hamano
34c4461ae3 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-12 12:42:44 -07:00
Junio C Hamano
8b0e15fa95 Update draft release notes to 1.7.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-10 16:14:59 -07:00
Junio C Hamano
7f41b6bbe3 Post 1.7.7 first wave 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-10-05 12:54:35 -07:00
Junio C Hamano
703f05ad58 Git 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-30 14:20:57 -07:00
Junio C Hamano
85e9c7e1d4 Git 1.7.7-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-23 15:35:57 -07:00
Junio C Hamano
b7619006eb Merge 1.7.6.4 in 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-23 15:31:08 -07:00
Junio C Hamano
6320526415 Git 1.7.6.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-23 14:43:05 -07:00
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
81a5bdd9c5 Sync with 1.7.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-12 10:43:17 -07:00
Junio C Hamano
740a8fc224 Git 1.7.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-12 10:33:40 -07:00
Junio C Hamano
2f9e2e7587 Merge branch 'maint' 
* maint:
  Prepare for 1.7.6.3 maintenance release
  SubmittingPathces: remove Cogito reference

Conflicts:
	RelNotes
 2011-09-11 22:35:11 -07:00
Junio C Hamano
c2d53586dd Prepare for 1.7.6.3 maintenance release 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-11 22:33:27 -07:00
Michael J Gruber
3793ac56b4 RelNotes/1.7.7: minor fixes 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-07 16:29:18 -07:00
Junio C Hamano
50963badbc Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-06 11:48:21 -07:00
Junio C Hamano
48f36dcd73 Sync with 1.7.6.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-06 11:42:12 -07:00
Junio C Hamano
509d59705e Git 1.7.6.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-06 11:41:02 -07:00
Junio C Hamano
b32128793d Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-09-02 13:26:02 -07:00
Junio C Hamano
e7734c6c9b Merge branch 'gb/maint-am-patch-format-error-message' 
* gb/maint-am-patch-format-error-message:
  am: format is in $patch_format, not parse_patch

Conflicts:
	git-am.sh
 2011-09-02 13:18:07 -07:00
Junio C Hamano
826603d118 Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-28 21:49:35 -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
8d9185bc12 Update draft release notes to 1.7.7 2011-08-23 15:44:50 -07:00
Junio C Hamano
d0b46502de Merge branch 'maint' 
* maint:
  Update draft release notes for 1.7.6.1
 2011-08-23 15:29:08 -07:00
Junio C Hamano
b0b35a6ac3 Update draft release notes for 1.7.6.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-23 15:28:18 -07:00
Junio C Hamano
cee426811c Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-18 22:10:23 -07:00
Junio C Hamano
f85a051d13 Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-17 17:48:36 -07:00
Junio C Hamano
4bfe7cb666 Sync with "maint" 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-16 14:23:43 -07:00
Junio C Hamano
50b68aeb39 Merge branch 'maint' 
* maint:
  Prepare for 1.7.6.1
  am: refresh the index at start and --resolved

Conflicts:
	GIT-VERSION-GEN
	RelNotes
 2011-08-16 14:22:26 -07:00
Junio C Hamano
8499644ea7 Prepare for 1.7.6.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-16 12:42:17 -07:00
Junio C Hamano
b91766295f Update draft release notes to 1.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-11 12:12:22 -07:00
Junio C Hamano
5c2f84599c Update draft release notes to 1.7.7 
The third batch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-07-22 15:32:03 -07:00
Junio C Hamano
d79bcd6805 Update draft release notes to 1.7.7 
The second batch of topics for this cycle are now in.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-07-19 10:44:51 -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
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
a6605d76cd Sync with 1.7.5.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-01 14:11:17 -07:00
Junio C Hamano
e5af0de202 Git 1.7.5.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-06-01 14:08:26 -07:00
Junio C Hamano
090a1a5d95 Update draft release notes to 1.7.6 
I think we are almost there for the feature freeze.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-31 12:22:50 -07:00
Junio C Hamano
2951df7a9a Sync with maint 2011-05-31 12:07:14 -07:00
Junio C Hamano
2b0b64ee85 Start 1.7.5.4 draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-31 12:06:40 -07:00
Junio C Hamano
665b051b90 Update 1.7.6 draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-26 10:41:33 -07:00
Junio C Hamano
1dcfb2ac65 Sync with 1.7.5.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-26 10:30:28 -07:00
Junio C Hamano
3c3e0b3c41 Git 1.7.5.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-26 10:29:29 -07:00
Junio C Hamano
5df3e2b3ca Update 1.7.6 draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-23 10:54:54 -07:00
Junio C Hamano
11bc3e92bf Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-19 21:02:20 -07:00
Junio C Hamano
b602ed7dea Update release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-16 17:19:24 -07:00
Junio C Hamano
6c7471bcf1 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.5.2
  Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
 2011-05-16 16:44:57 -07:00
Junio C Hamano
ea1ab4b280 Update draft release notes to 1.7.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-16 16:44:50 -07:00
Junio C Hamano
c565cb452c Sync release notes for 1.7.6 to exclude what are in maintenance track 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-15 16:19:16 -07:00
Junio C Hamano
f574cb3404 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.5.2
  git_open_noatime(): drop unused parameter
  sha1_file: typofix
 2011-05-15 16:16:56 -07:00
Junio C Hamano
96dbe93da5 Update draft release notes to 1.7.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-15 16:11:55 -07:00
Junio C Hamano
2de58b398b Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-13 11:14:07 -07:00
Junio C Hamano
32341b9df5 Merge branch 'maint' 
* maint:
  Prepare for 1.7.5.2
  t5400: Fix a couple of typos

Conflicts:
	RelNotes
 2011-05-13 10:58:10 -07:00
Junio C Hamano
375f8a032e Prepare for 1.7.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-13 10:57:09 -07:00
Junio C Hamano
dbe9c5adf9 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-11 11:56:11 -07:00
Junio C Hamano
4e3aa87d13 Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-06 11:13:08 -07:00
Junio C Hamano
505a138cbd Update draft release notes to 1.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-04 16:02:17 -07:00
Junio C Hamano
7ab576ce2d Sync with 1.7.5.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-05-04 15:49:04 -07:00