mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-22 17:09:18 +02:00
Code
46,028 Commits 6 Branches 956 Tags 351 MiB
8f9aeb0d36
Commit Graph

1001 Commits

Author SHA1 Message Date
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
Junio C Hamano
27b0ea4038 Twelfth batch for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-08-10 12:37:53 -07:00
Junio C Hamano
8e4b75a97b Yet another batch for 2.9.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-08-10 11:56:56 -07:00
Junio C Hamano
a0a1831b03 Sync with maint 
* maint:
  Hopefully final batch for 2.9.3
 2016-08-08 14:52:17 -07:00
Junio C Hamano
0aaf2500f1 Eleventh batch for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-08-08 14:52:08 -07:00
Junio C Hamano
00f27feb6a Hopefully final batch for 2.9.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-08-08 14:22:36 -07:00
Junio C Hamano
c6b0597e9a Tenth batch for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-08-04 14:40:34 -07:00
Junio C Hamano
80460f513e Ninth batch of topics for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-08-03 15:13:16 -07:00
Junio C Hamano
f8f7adce9f Sync with maint 
* maint:
  Some fixes for 2.9.3
 2016-07-28 14:21:18 -07:00
Junio C Hamano
8213178c86 Eighth batch of topics for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-28 14:20:48 -07:00
Junio C Hamano
08df31eecc Some fixes for 2.9.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-28 11:28:32 -07:00
Junio C Hamano
8c6d1f9807 Seventh batch of topics for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-25 14:17:28 -07:00
Junio C Hamano
08bb3500a2 Sixth batch of topics for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-19 13:26:16 -07:00
Junio C Hamano
82246e075e Sync with 2.9.2 
* maint:
  Git 2.9.2
  t0006: skip "far in the future" test when unsigned long is not long enough
 2016-07-15 10:49:23 -07:00
Junio C Hamano
e634160bf4 Git 2.9.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-15 10:48:16 -07:00
Junio C Hamano
79ed43c28f Fifth batch of topics for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-13 11:30:25 -07:00
Junio C Hamano
b1ec08fda8 Sync with v2.9.1 
* maint:
  Git 2.9.1
 2016-07-11 10:46:39 -07:00
Junio C Hamano
5c9159de87 Git 2.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-11 10:45:50 -07:00
Junio C Hamano
d0ccc82ad8 Fourth batch of topics for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-11 10:36:29 -07:00
Junio C Hamano
5c589a73de Third batch of topics for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-06 13:42:58 -07:00
Junio C Hamano
789808fe48 Sync with maint 
* maint:
  More fixes for 2.9.1
  mailmap: use main email address for dturner
 2016-07-06 13:42:37 -07:00
Junio C Hamano
674d38f55b More fixes for 2.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-07-06 13:08:02 -07:00
Junio C Hamano
cf4c2cfe52 Second batch of topics for 2.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-06-27 10:07:08 -07:00
Junio C Hamano
e1658495be Sync with maint 
* maint:
  Start preparing for 2.9.1
 2016-06-27 10:00:15 -07:00
Junio C Hamano
2ff7dff01e Start preparing for 2.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-06-27 09:59:51 -07:00
Junio C Hamano
ab7797dbe9 Start the post-2.9 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-06-20 11:06:49 -07:00
Junio C Hamano
a28705da92 Hopefully the final last-minute update before 2.9 final 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-06-10 15:30:19 -07:00
Junio C Hamano
49fa3dc761 Git 2.9-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-06-06 14:34:52 -07:00
Junio C Hamano
c42b5d8e69 Sync with 2.8.4 
* maint:
  Git 2.8.4
 2016-06-06 14:30:49 -07:00
Junio C Hamano
0b65a8dbdb Git 2.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-06-06 14:29:32 -07:00
Junio C Hamano
6326f19925 Almost ready for 2.9-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-06-03 14:38:35 -07:00
Junio C Hamano
60bd4b1c51 Git 2.9-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-31 14:12:15 -07:00
Junio C Hamano
257f6f404b Merge branch 'maint' 
* maint:
  More topics for 2.8.4
 2016-05-31 14:12:08 -07:00
Junio C Hamano
4b0891ffe4 More topics for 2.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-31 14:11:38 -07:00
Junio C Hamano
f3913c2d03 Final batch before 2.9-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-29 18:08:26 -07:00
Junio C Hamano
7777322816 Sync with maint 
* maint:
  Start preparing for 2.8.4
  archive-tar: convert snprintf to xsnprintf
 2016-05-26 13:28:24 -07:00
Junio C Hamano
b051c59a00 Start preparing for 2.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-26 13:21:00 -07:00
Junio C Hamano
3a0f269e7c Git 2.9-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-23 15:02:48 -07:00
Junio C Hamano
3916adf997 Sync with 2.8.3 
* maint:
  Git 2.8.3
 2016-05-18 15:33:57 -07:00
Junio C Hamano
0f8e831356 Git 2.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-18 15:32:41 -07:00
Junio C Hamano
1f66975deb Thirteenth batch for 2.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-17 14:47:06 -07:00
Junio C Hamano
edec3709db Twelfth batch for 2.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-13 13:23:24 -07:00
Junio C Hamano
5fe494c54a Eleventh batch for 2.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-10 13:46:57 -07:00
Junio C Hamano
63a35025b1 Sync with maint 
* maint:
  Almost ready for 2.8.3
 2016-05-06 14:53:45 -07:00
Junio C Hamano
d92347f59f Almost ready for 2.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-06 14:53:36 -07:00
Junio C Hamano
a3fe55458a Tenth batch for 2.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-06 14:51:51 -07:00
Junio C Hamano
69d4380b47 Ninth batch for 2.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-03 14:15:10 -07:00
Junio C Hamano
ee88674f24 Sync with maint 
* maint:
  Start preparing for 2.8.3
 2016-05-02 15:50:34 -07:00
Junio C Hamano
5b618c1c8d Start preparing for 2.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-05-02 14:24:36 -07:00
Junio C Hamano
bbc6168016 Eighth batch for 2.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-29 14:21:09 -07:00
Junio C Hamano
cc00d9cfff Sync with 2.8.2 2016-04-29 14:20:47 -07:00
Junio C Hamano
60115f54bd Git 2.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-29 14:19:11 -07:00
Junio C Hamano
e1f0df79a8 Seventh batch for post 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-25 15:18:35 -07:00
Junio C Hamano
a0c4ddf677 Sixth batch for post 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-22 15:48:03 -07:00
Junio C Hamano
e6ac6e1f7d Fifth batch for post 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-18 10:51:09 -07:00
Junio C Hamano
b8b4d93100 Merge branch 'maint' 
* maint:
  Prepare for 2.8.2
  Start preparing for 2.8.2
 2016-04-14 18:59:09 -07:00
Junio C Hamano
6a6636270f Prepare for 2.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-14 18:58:11 -07:00
Junio C Hamano
167259bf83 Start preparing for 2.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-13 16:30:00 -07:00
Junio C Hamano
dc0db2c0b9 Fourth batch for post 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-13 14:19:47 -07:00
Junio C Hamano
7b0d47b3b6 Third batch for post 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-08 14:34:11 -07:00
Junio C Hamano
72d917a7f9 Second batch for post 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-06 11:44:24 -07:00
Junio C Hamano
6a269e52a5 First batch for post 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-03 10:55:36 -07:00
Junio C Hamano
d95553a6b8 Git 2.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-04-03 10:14:12 -07:00
Junio C Hamano
90f7b16b3a Git 2.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-28 12:19:45 -07:00
Junio C Hamano
047057bb41 RelNotes: remove the mention of !reinclusion 
We will be postponing this to a later cycle.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-18 11:10:53 -07:00
Junio C Hamano
44915db935 Sync with Git 2.7.4 
* maint:
  Git 2.7.4
  Git 2.6.6
  Git 2.5.5
  Git 2.4.11
 2016-03-17 12:54:17 -07:00
Junio C Hamano
937978e0f3 Git 2.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-17 11:32:13 -07:00
Junio C Hamano
8e9cc5f3e2 Sync with Git 2.6.6 
* maint-2.6:
  Git 2.6.6
  Git 2.5.5
  Git 2.4.11
 2016-03-17 11:28:52 -07:00
Junio C Hamano
e46579643d Git 2.6.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-17 11:26:41 -07:00
Junio C Hamano
ce4d4e763c Merge branch 'maint-2.5' into maint-2.6 
* maint-2.5:
  Git 2.5.5
  Git 2.4.11
  list-objects: pass full pathname to callbacks
  list-objects: drop name_path entirely
  list-objects: convert name_path to a strbuf
  show_object_with_name: simplify by using path_name()
  http-push: stop using name_path
  tree-diff: catch integer overflow in combine_diff_path allocation
  add helpers for detecting size_t overflow
 2016-03-17 11:26:18 -07:00
Junio C Hamano
e568e563ad Git 2.5.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-17 11:24:59 -07:00
Junio C Hamano
c638f3e4d5 Merge branch 'maint-2.4' into maint-2.5 
* maint-2.4:
  Git 2.4.11
  list-objects: pass full pathname to callbacks
  list-objects: drop name_path entirely
  list-objects: convert name_path to a strbuf
  show_object_with_name: simplify by using path_name()
  http-push: stop using name_path
  tree-diff: catch integer overflow in combine_diff_path allocation
  add helpers for detecting size_t overflow
 2016-03-17 11:24:14 -07:00
Junio C Hamano
765428699a Git 2.4.11 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-17 11:23:05 -07:00
Junio C Hamano
d9c691a759 Git 2.8-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-16 14:13:37 -07:00
Junio C Hamano
c2c5f6b1e4 RelNotes for 2.8.0: typofix 
Helped-by: Max Horn
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-15 10:58:59 -07:00
Junio C Hamano
ed9067f705 Git 2.8-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-10 11:16:23 -08:00
Junio C Hamano
5d1847b760 Sync with 2.7.3 2016-03-10 11:15:50 -08:00