Junio C Hamano
ab37a18b60
Merge branch 'maint-2.5' into maint-2.6
2017-05-05 12:52:26 +09:00
Junio C Hamano
ac33201285
Git 2.5.6
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-05 12:50:38 +09:00
Junio C Hamano
531788af95
Merge branch 'maint-2.4' into maint-2.5
2017-05-05 12:46:53 +09:00
Junio C Hamano
4000b40209
Git 2.4.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-05 12:43:16 +09:00
Junio C Hamano
4fa66c85f1
Git 2.13-rc2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-04 16:27:19 +09:00
Junio C Hamano
d2bbb7c2bc
Merging a handful of topics before -rc2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-04-30 22:16:18 -07:00
Junio C Hamano
027a3b943b
Git 2.13-rc1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-04-26 15:44:07 +09:00
Junio C Hamano
e2cb6ab84c
Getting ready for -rc1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-04-23 22:34:04 -07:00
Junio C Hamano
6a2c2f8d34
Git 2.13-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-04-19 21:42:08 -07:00
Junio C Hamano
584f8975d2
Twelfth batch for 2.13
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-04-16 23:30:49 -07:00
Junio C Hamano
cf11a67975
Eleventh batch for 2.13
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-04-11 00:27:05 -07:00
Junio C Hamano
b14f27f917
Tenth batch for 2.13
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-30 14:14:32 -07:00
Junio C Hamano
e1104a5ee5
Ninth batch for 2.13
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-28 14:14:56 -07:00
Junio C Hamano
e471fa3405
Sync with 'maint'
2017-03-28 14:14:24 -07:00
Junio C Hamano
49800c9407
Prepare for 2.12.3
2017-03-28 13:54:14 -07:00
Junio C Hamano
e0ef7fe78c
Eighth batch for 2.13
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-27 11:00:12 -07:00
Junio C Hamano
034667a458
Git 2.12.2
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJY1XqcAAoJELC16IaWr+bL0/EQAMFyPd8Rzjpt+yWs/gSllSSB
KuBKpBssfBVhqEjHz7o1y3NseOzQj6mbJR3WIrGpUOhlzDU/ARFYL//3EkHEbDzd
Cw9BXfU5B/zfkP9zPI8ecmjmjFfRwrCGA+DOTXYAA5RZz0Done+VsZwQYsBShEd8
7cQNFNoThic4ww3Lba+VM6rh+6D89PcG21pQQy+DgwEWWTYPQXmebIYAnCgpLGcv
JLIPgefEBGwDlQ08rGZaiuKU3cqSSXIovNz7Oslntr6OlH3tox4lHtGVV3w/i2uY
/488+yiKqO7MP85/0Qg8xmv1sVnGOk9UilS18OsJsHGd1uByjWq6abfbdGqEmYJR
JhY5L3OBX8hlCsP3//JESqMWoXFZTzaCL2FQAh59FdNTk0BxvQFw3OVRz2CP6Y6y
Ghn4ywU3HSgZDYzPjE7sHsn+xTUAm3BZcHZ0VWM0we3QRibTewVkBmAh8nukZxfb
MutOGVRTHBoPKlQ+THz6eyBHV4N431Wko+Zq7bl4KttJk/WXl1nCzyLVi0TizsoO
NfeI1dtrOnMiBMR+dAIWoNd9cyDMU6j1wzvnWoCZs8YUrtegB9cM6XbI+gJ5NK6v
TVvYcqoZf4JFteYqVAXN7NtHApPcoPDOtV4vsB/qNoY2xiX7YZRGshuijlst6jOC
WfuyDe+wnrMb4Q4LVknC
=jgnW
-----END PGP SIGNATURE-----
Sync with 2.12.2
2017-03-24 13:31:01 -07:00
Junio C Hamano
ea5b2dd28f
Seventh batch for 2.13
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 13:30:34 -07:00
Junio C Hamano
8f9aeb0d36
Git 2.12.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 12:59:15 -07:00
Junio C Hamano
afd6726309
Sync with maint
2017-03-21 15:11:38 -07:00
Junio C Hamano
92f74a6192
Sixth batch for 2.13
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-21 15:11:13 -07:00
Junio C Hamano
8624735d9a
Prepare for 2.12.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-21 15:04:12 -07:00
Junio C Hamano
9d77b0405c
Fifth batch for 2.13
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-17 13:51:58 -07:00
Junio C Hamano
32c43f595f
Sync with 'maint'
...
* maint:
Preparing for 2.12.1
2017-03-16 14:03:11 -07:00
Junio C Hamano
7c9c2f8c39
Preparing for 2.12.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-16 14:01:20 -07:00
Junio C Hamano
4a9b9b32d4
Fourth batch after 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-14 15:29:40 -07:00
Junio C Hamano
d6db3f2165
Third batch after 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-12 23:24:14 -07:00
Junio C Hamano
625568cd88
Second batch after 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-10 13:25:21 -08:00
Junio C Hamano
3bc53220cb
First batch after 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-27 14:04:24 -08:00
Junio C Hamano
e7e07d5a4f
Git 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-24 10:49:58 -08:00
Junio C Hamano
076c05393a
Hopefully the final batch of mini-topics before the final
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-16 14:46:35 -08:00
Junio C Hamano
d09b692797
A bit more for -rc2
2017-02-15 14:58:25 -08:00
Junio C Hamano
5588dbffbd
Git 2.12-rc1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-10 12:54:23 -08:00
Junio C Hamano
6e3a7b3398
Git 2.12-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-03 11:29:52 -08:00
Junio C Hamano
8a8f121049
Sync with v2.11.1
...
* maint:
Git 2.11.1
2017-02-02 13:43:19 -08:00
Junio C Hamano
289ec4d9ba
Ninth batch for 2.12; almost ready for -rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-02 13:43:10 -08:00
Junio C Hamano
3b9e3c2ced
Git 2.11.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-02 13:21:27 -08:00
Junio C Hamano
8f60064c1f
Sync with maint
...
* maint:
Ready for 2.11.1
2017-01-31 13:34:59 -08:00
Junio C Hamano
b32fe956d0
Ready for 2.11.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-31 13:34:48 -08:00
Junio C Hamano
3c4ce8e69b
Eighth batch for 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-31 13:20:46 -08:00
Junio C Hamano
4e59582ff7
Seventh batch for 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-23 16:00:40 -08:00
Junio C Hamano
787f75f056
Sixth batch for 2.12
2017-01-18 15:15:36 -08:00
Junio C Hamano
3313b78c14
RelNotes: drop merge-later comments for maint
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-17 15:27:13 -08:00
Junio C Hamano
733671b0fd
Merge branch 'maint'
2017-01-17 15:20:16 -08:00
Junio C Hamano
ad36dc8b4b
Almost ready for 2.11.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-17 15:19:11 -08:00
Junio C Hamano
d7dffce1ce
Fifth batch 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-10 15:25:46 -08:00
Junio C Hamano
e05806da9e
Fourth batch for 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-27 09:17:51 -08:00
Junio C Hamano
1d1bdafd64
Third batch for 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-21 14:57:26 -08:00
Junio C Hamano
6610af872f
Second batch for 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-19 14:50:31 -08:00
Junio C Hamano
eff96d7e16
First batch for 2.12
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-16 15:30:13 -08:00
Junio C Hamano
de2efebf7c
Early fixes for 2.11.x series
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-13 14:13:17 -08:00
Junio C Hamano
8d7a455ed5
Start post 2.11 cycle
...
For now, let's call it 2.12 tentatively.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-05 11:31:47 -08:00
Junio C Hamano
a274e0a036
Sync with maint-2.10
...
* maint-2.10:
preparing for 2.10.3
2016-12-05 11:25:47 -08:00
Junio C Hamano
c3808ca698
preparing for 2.10.3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-12-05 11:25:02 -08:00
Marc Branchaud
aeddbfdfa4
RelNotes: spelling and phrasing fixups
...
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-11-28 15:58:48 -08:00
Junio C Hamano
e2b2d6a172
Git 2.11-rc3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-11-23 11:24:59 -08:00
Junio C Hamano
1310affe02
Git 2.11-rc2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-11-17 13:47:36 -08:00
Junio C Hamano
3ab228137f
Git 2.11.0-rc1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-11-11 14:04:32 -08:00
Junio C Hamano
be5a750939
A bit of updates post -rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-11-01 12:59:58 -07:00
Junio C Hamano
1fe8f2cf46
Git 2.11-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-31 13:19:53 -07:00
Junio C Hamano
7805bda2ac
Git 2.10.2
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJYE3auAAoJELC16IaWr+bLaxUQAKP/acM6xJ/5bT9l8cISh6Ac
lEmOhbnQ2awPkqObk4yJKJPPzwznNsFSK4j3MlVqlGdPdFY9jHnI49QFUPNGeDnx
ledmfH6YJHi9hln/cyqNmGvG95uszAqgYQBYthsFS7Zr2XtXp2w2YUosNWt+ghfU
s66Vbll5X7k7KlAkxryW257D5WNtjuv2Agy1gnVZyOHOR+qHIBVc4hK6ZfjjD/4k
yQGLP5BEFEb+4nzOVgGJ1auh4cLEtySMp0qV5tiaJG4KXitQZ5j+rLBIDMDQSGFk
14eW+0/U0dFhqoTtF7V8KQ96ObSvCWfQh+1wRsEemspYwPF2Ahp/EvlDXdKzU+7R
av4dSrK4K0HMa2W3LfM4tDk+ghBOrhQfib426Dp3NWKxlCXqRGtNcir7vC9AP34W
op9zi5bR47eZAWOkBykL1zAN8ukt9oyuGog9Zrt+Ie9D7LHIgdZUBNhAYzB1u0xi
ggkHRu3V5vAaKOTu5ULDbRfDkFPGgRNewQjozhNOcv/LJR4zYVZamPZ7C+aPtmhv
hINdC2SrfANL2wIwjKGtFsUmzkDObuvRXuDuA6+oE+qLBHycfRiwVaFchPqw5cCa
afO4b2qoV9m4p+I4frt9XeckLwfEytBjwEGLOMe9SAk9qvHmJrDk6sO+j80y2v3j
IFHXRKS4bzNFYzYrEzbN
=JIxn
-----END PGP SIGNATURE-----
Sync with 2.10.2
2016-10-28 09:04:06 -07:00
Junio C Hamano
ac84098b7e
Git 2.10.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-28 09:02:44 -07:00
Junio C Hamano
eda7eebe6f
Getting ready for 2.11-rc0
...
... but not quite yet. A few more topics to go.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-27 15:06:24 -07:00
Junio C Hamano
2cc2e70264
Eleventh batch for 2.11
...
There still are a few topics that need to go in before -rc0 which
would make the shape of the upcoming release clearer, but here is
the final batch before it happens.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-26 13:28:47 -07:00
Junio C Hamano
720265749d
Tenth batch for 2.11
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-17 13:26:27 -07:00
Junio C Hamano
3cdd5d1917
Sync with maint
...
* maint:
Start preparing for 2.10.2
2016-10-11 14:55:48 -07:00
Junio C Hamano
74eeaf7b72
Start preparing for 2.10.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-11 14:24:02 -07:00
Junio C Hamano
8a36cd87b7
Ninth batch for 2.11
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-10 14:09:12 -07:00
Junio C Hamano
a23ca1b8dc
Eighth batch for 2.11
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-06 14:55:18 -07:00
Junio C Hamano
0cf36115dc
Sync with 2.10.1
...
* maint:
Git 2.10.1
2016-10-03 13:32:41 -07:00
Junio C Hamano
30d687dfd5
Seventh batch for 2.11
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-03 13:32:19 -07:00
Junio C Hamano
6406bdc0b9
Git 2.10.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-03 13:24:18 -07:00
Junio C Hamano
3ef7618e61
Sync with maint
...
* maint:
Prepare for 2.10.1
2016-09-29 16:58:29 -07:00
Junio C Hamano
641b158a28
Sixth batch for 2.11
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-29 16:58:20 -07:00
Junio C Hamano
92d426662b
Prepare for 2.10.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-29 16:52:15 -07:00
Junio C Hamano
21f862b498
Fifth batch for 2.11
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-26 16:11:46 -07:00
Junio C Hamano
6fe1b1407e
Fourth batch for 2.11
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-21 15:20:44 -07:00
Junio C Hamano
f6727b0509
Sync with maint
...
* maint:
Start preparing for 2.10.1
2016-09-19 13:55:18 -07:00
Junio C Hamano
7c0304af62
Start preparing for 2.10.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-19 13:54:50 -07:00
Junio C Hamano
2118cdc7d3
Third batch for 2.11
...
This round they are somewhat bigger topics.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-19 13:48:25 -07:00
Junio C Hamano
e510a86c81
Second batch for 2.11
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-15 14:13:06 -07:00
Junio C Hamano
75d03ac84b
First batch for 2.11
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-12 15:35:05 -07:00
Junio C Hamano
cda1bbd474
Sync with maint
...
* maint:
Prepare for 2.9.4
2016-09-08 22:00:53 -07:00
Junio C Hamano
95b18556aa
Start the 2.11 cycle
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-08 22:00:35 -07:00
Junio C Hamano
49981d8a25
Start maintenance track for 2.10.x series
2016-09-08 21:39:38 -07:00
Junio C Hamano
0202c411ed
Prepare for 2.9.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-08 21:37:59 -07:00
Junio C Hamano
5b18e70009
A few more fixes before the final 2.10
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-31 10:21:05 -07:00
Junio C Hamano
d5cb9cbd64
Git 2.10-rc2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-26 13:59:20 -07:00
Junio C Hamano
5cb0d5ad05
Prepare for 2.10.0-rc2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-25 13:56:51 -07:00
Junio C Hamano
2632c897f7
Git 2.10-rc1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-19 15:39:33 -07:00
Junio C Hamano
d63263a4de
RelNotes: final batch of topics before -rc1
2016-08-17 14:09:17 -07:00
Junio C Hamano
07d1a42bad
relnotes: redo the description of text=auto fix
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-17 11:31:40 -07:00
Junio C Hamano
07c92928f2
Relnotes: decribe the updates to the "text=auto" attribute
...
Helped-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-15 13:15:49 -07:00
Junio C Hamano
726cc2ba12
Git 2.10-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-14 14:48:06 -07:00
Junio C Hamano
2376d31787
Git 2.9.3
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJXrfa3AAoJELC16IaWr+bLLY8QANE8ZaL+qyhjC8fHfJhhr4cY
GeZe8x9SSTNv0WzOvXGf34XwdpOYYiVrUrwlgBx6HglhDeYzCp4kObR5sHwtTKgN
r0KKvAuvjlZJm5tWNavu2fDoHKhE+QRP3AagaF5iDX68QLjhGOS8+zAWqNRukh7y
X6tmdUhGhWPtUKr1LBUVd94GdF8v5tggCNDcqZZj+dPIosPvlDqGWT29/IKyCU/a
4o91hD5jWkMybfyTwzZDsSYmtB4TXxML8idJUdZQ5LyyPq9uSU63lgP8ljwivYzy
oiVB1OOawym7+PeyvZEvLvpFW1Ks7YSTCMNQjn4Y3dxYF3szuoPZV3ztCzngoEIG
qSuzA0sn6zfaMWAQF2Yjix2zBfSlBXmxNzA/WqYAyNr3Lsias5A/X9nFtowSEi56
0iFVilSsKWc3bC0oNEyYFlUs1kY4rR2S5kbBXTJ6l75bvDvXP/L+JXm4QcRCr92i
6i7NYxeNqfnZZV72KeG2EqZaL4mrXAY68Mjv8jd/80oogCUDBhlTKd8IK/WG64M9
VjfHpvKmtkBaIq6Zz0cQxO1pe4F64GzSNzlC9l787iQCnUW+4BO7OyEAByJWzHn+
D5oSfWI79MDVdvw2UlHvk1tg4bNNYLcNwTGZGQhcwXudv7hpzW3s1PBNY0LzXGux
LBOdlVeCcsYGr2rsRMbm
=PhTI
-----END PGP SIGNATURE-----
Sync with 2.9.3
* tag 'v2.9.3':
Git 2.9.3
2016-08-12 10:02:18 -07:00
Junio C Hamano
2807cd7b25
Final batch before 2.10-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-12 10:01:48 -07:00
Junio C Hamano
e6b8f80653
Merge branch 'vs/typofix'
...
* vs/typofix:
Spelling fixes
2016-08-12 09:47:37 -07:00
Junio C Hamano
e0c1ceafc5
Git 2.9.3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-12 09:17:51 -07:00
Ville Skyttä
2e3a16b279
Spelling fixes
...
<BAD> <CORRECTED>
accidently accidentally
commited committed
dependancy dependency
emtpy empty
existance existence
explicitely explicitly
git-upload-achive git-upload-archive
hierachy hierarchy
indegee indegree
intial initial
mulitple multiple
non-existant non-existent
precendence. precedence.
priviledged privileged
programatically programmatically
psuedo-binary pseudo-binary
soemwhere somewhere
successfull successful
transfering transferring
uncommited uncommitted
unkown unknown
usefull useful
writting writing
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-11 14:35:42 -07:00
Junio C Hamano
a42d7b6a5b
Sync with maint
...
* maint:
Yet another batch for 2.9.3
2016-08-10 12:38:02 -07:00