undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,485 Commits 1 Branch 0 Tags 217 MiB
40c17eb184
Commit Graph

1053 Commits

Author SHA1 Message Date
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
Junio C Hamano
594730e980 Git 2.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-10 11:14:08 -08:00
Junio C Hamano
ab5d01a29e Git 2.8-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-03-04 13:48:55 -08:00
Junio C Hamano
f02fbc4f94 Git 2.8-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-02-26 13:45:26 -08:00
Junio C Hamano
56f37fda51 Eighth batch for 2.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-02-24 13:31:57 -08:00
Junio C Hamano
70bd996071 Git 2.7.2 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWy3nfAAoJELC16IaWr+bLaA0QAMkWQiqb1ptDO8/dBxoibYSy
 jxYE9vLDjgd+fuX7NkB6ezGv0WtZ2DJI2klXvPf/uZe2f5orFOEQ0TlHJxeJFFJ0
 tR8mwCQcYIR0SuK/RxvEUNrs3iC3F6bs3iP9DPesginIyzL3DMpJCHNifkbF4uXG
 veapEUiQbW09+Ye3/k24meK6hLHCFVfH8sEQail6hGDAP0hMbv28FMn6RlzgTzvj
 83yn3Negy7p76ILQhC/PZDxTSMFt++2ppUnK7f6hERFXIQq9GXoV2vx7vW2aF1Yq
 MxuvMKNON6B8wBRYP0e8FXxdUlJDtlLyWo/dhOQCq2fyPyGAa39Y3xHRziLpGPgW
 ad5FBDuphQkujFDkJghvo7LR0WfYLiJiFIztlb6WBvQj38GP323JbGExzkVXjUal
 n9on42puk8Zzf0MnaKBtEMPb69rAfX7yFIbt2q4z/c7U7obwtmZHiXc8H2GJnUyj
 IWT5estJQrpQ+HglNO+yrfuFgUm2L4TciN9Gq9pD4TSKvmDFHSevVefX5Qz+2eeV
 nSltULr94l1PqWkQJ1Szg9JUC8eembLxdpFtiS+o5RWWHrbBBbXXuG/jbRFw8d7H
 Gy1cP3/YkJlMw0v4zcN/W1SfLPAk2MOsYJCkdVRoXSWctLISq8WQ7Fp+W5vMcsR+
 t0hA5/uTsOH2bEsaXWTE
 =DkAI
 -----END PGP SIGNATURE-----

Sync with 2.7.2
 2016-02-22 13:16:12 -08:00
Junio C Hamano
326e5bc91e Git 2.7.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-02-22 13:12:56 -08:00
Junio C Hamano
0233b800c8 Merge branch 'maint' 
* maint:
  Start preparing for 2.7.2
  git-cvsserver.perl: fix typo
 2016-02-17 10:14:39 -08:00
Junio C Hamano
6343832797 Seventh batch for the 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-02-17 10:13:57 -08:00
Junio C Hamano
8a71d90b7e Start preparing for 2.7.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-02-17 10:05:44 -08:00
Junio C Hamano
4943984737 Sixth batch for the 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-02-10 14:24:14 -08:00
Junio C Hamano
ff4ea6004f Git 2.7.1 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWtS7YAAoJELC16IaWr+bLPvkP/jSOaXWadi3lvLak08Ykp6yp
 zEAiMJz8UldpomIGKXDxgD6LH4TniYLi88pHhVQZlDarcJqEX71AZuJ59servwK6
 8RqJiEMPvwh4qhUDLEy2ZBQ+z6EOahBIM5v9aOegYzOQI4dNFinhFSrootTymdGk
 GxYX1/9xjm9HFNNwTBp9lBRpZmPKyjXzE2KnjyKEqzO5tP+KSOuW0qFbc68qTzrK
 bBXA1Y6DVOcK2PdwRBcyNxpw2TxvQxaYDR+Cxf7JghLGdv+fwSYiNORtnoJI83pE
 tANWjo0fyF3m/5vjAdwuzLnMktUEKyguWemV/0Zmk9bZO2bHQYiwE3lvtkFLzG3U
 H+wKsI8Ln/pq0/264kOLKO7TC+EcsrKAZFR9SiGH7KT6t1R4YW/U8Oiq3cTC5vM7
 0gJKNny3b95QMMxRol8N/id0V/T/NVeQ0hvJFAYvH3lgaQ+HmTR5yjltqGle3LHb
 lJolSJhJdAF3+qcTdSecItU5F1Up8fHl10Cq7b+QV7S2xgrIBylA5oUmMw/+y6+H
 S8qcTJHgmTDSyNlEf4dJTNU6Zj/WPBNhp1f7E3UgXdXTru32lBsDHSgUhv/lvLKz
 GGRZIFTVGLvjL/q9N7uXhCJ1+4Wdh8tbhQG9vO4mEka4BRl5X2+i0vO+nXhfpMUo
 /Bmb9kSXGn/x7x4ldDlz
 =Bk/p
 -----END PGP SIGNATURE-----

Sync with 2.7.1
 2016-02-05 15:24:02 -08:00
Junio C Hamano
a08595f761 Git 2.7.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-02-05 14:54:56 -08:00
Junio C Hamano
563e38491e Fifth batch for 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-02-03 14:31:13 -08:00
Junio C Hamano
07c314d22d Getting closer to 2.7.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-02-01 15:17:29 -08:00
Junio C Hamano
701fa7fe35 Fourth batch for 2.8.cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-01-28 16:14:25 -08:00
Junio C Hamano
d10e2cb9d0 Third batch for 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-01-26 15:41:04 -08:00
Junio C Hamano
3ee1e0fe11 Second batch for 2.8 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-01-20 11:54:46 -08:00
Junio C Hamano
c9906e47c0 First batch for post 2.7 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-01-12 15:20:51 -08:00
Junio C Hamano
3e9226acc8 Git 2.6.5 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWiuzQAAoJELC16IaWr+bL9q4P/A9p1EMRvT1Bgw0umQosE0Bc
 U241cR8K3lH4CaJZTBreNcDlHJljmf1nzBLbSemniGn+7fwQQRsRva9ts2gOdWUX
 ekJq6Uj5U1fwEUVLVJWCaEqe8QORGGR5DsrlwoitjTZ8AAzRuLcCDZzNADkl64qD
 D3q8AFlWIhFIP12e1FxveTV5yhy1FQcAG90uYpWdAKkMPzciAM6ChqJyBJ+OCZXb
 DI1zoX1rSWtG27q9D2j3s0hc27glovW1khGMOfTQKAzgkCZLsqFOombTn8ndVPv4
 8kB/PdXSK3R6oUoU2ZQVv9fkqzzcvs4buqX8DA3uaDUMqoAhr7f4VqCXoc7y91qO
 dCHeL1lpYOHgfXULWp6rqKi6i8kfHqPIS48TdFRS4eL2c0Z1VV1WWUsmvYVPCPt4
 Lm5TIheHShUOewzHHHITnkbXXs9A8GX0gOHqSM6GZeJvel8LP+GbWCoxzNz3stVA
 pZpUJt2r/H8C4PYzT31M0gmAAeeN0q6BcP3YJ6utbF9xpzx4gszBt2NehVDEPN9g
 m06Bv1UQDP1X+wsZ4YKXrjGaS/BypCVhBqvtFMN0WbUurQIPUl1zrf7eVkMElKtT
 4XAJMtzdy1wL5O4VfzEmgwOWDSS/21xGuy2J0TRifVRnOh5ExefFpt8yJ5Kqp0Iq
 RmT2UHk8dLmz52etpQ9F
 =zPJG
 -----END PGP SIGNATURE-----

Sync with 2.6.5
 2016-01-04 14:06:59 -08:00
Junio C Hamano
833e48259e Git 2.6.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2016-01-04 14:06:00 -08:00
Junio C Hamano
28274d02c4 Git 2.7-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-28 14:00:52 -08:00
Junio C Hamano
554f6e4106 Git 2.7-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-22 14:46:01 -08:00
Junio C Hamano
1d88dab47a Update release notes to 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-21 11:08:20 -08:00
Junio C Hamano
f900c8326a Git 2.7-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-15 09:47:11 -08:00
Junio C Hamano
bdb32a88fa Sync with maint 2015-12-15 09:45:16 -08:00
Junio C Hamano
1aaf149757 Update draft release notes to 2.6.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-15 09:44:54 -08:00
Junio C Hamano
4b9ab0ee01 Update release notes to 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-11 11:20:23 -08:00
Junio C Hamano
52b2e6be99 Merge branch 'maint' 
* maint:
  Prepare for 2.6.5
 2015-12-11 11:19:43 -08:00
Junio C Hamano
49e863b02a Prepare for 2.6.5 
This back-merges hopefully the last batch of trivially correct fixes
to the 2.6.x maintenance track from the master branch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-11 11:17:47 -08:00
Junio C Hamano
86c95ac5d2 Update release notes to 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-10 12:43:52 -08:00
Junio C Hamano
fa5f2398e5 Sync with 2.6.4 2015-12-08 14:13:52 -08:00
Junio C Hamano
bdfc6b364a Git 2.6.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-08 14:12:45 -08:00
Junio C Hamano
e5da8655b2 Sync with maint 
* maint:
  Prepare for 2.6.4
 2015-12-04 11:39:56 -08:00
Junio C Hamano
9a8c740225 Prepare for 2.6.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-04 11:39:19 -08:00
Junio C Hamano
9ed86a5d4e RelNotes update for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-12-04 11:31:28 -08:00
Junio C Hamano
f34be46e47 Eleventh batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-11-05 15:26:08 -08:00
Junio C Hamano
2c78628255 Git 2.6.3 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWO7oaAAoJELC16IaWr+bLwiQQANoJ1mtinMYQjqq4oNTKTNw1
 YTPCg1CF+QglubvywBSWxujhpdou/Ibup6DSKnGQKiueRbCZZXkxWSgGaTY5mpi1
 N9Y6NaQDlTwdZIF6LYv+5PrKFw2Ad2n3Pcj8EELsw7FnC5EiiBwmagJPzuwsyznK
 07pJ5kySJW3Zq06jiv1xKKiqKhMyYiLtlqFsrevAnOm5WFG2eNPLMneBrcXE4/yV
 u4DCAuXtfjiXq3zLMdjXNgRia64SQ+TukIbBox7hAh+TFaPiE9ZB+dM4dlSJM8DP
 lHQT/WjMJx0AgkUdFsF7HZ/K3I3yoXGR4oe/2QH+Tu6UXCeb+ol1Xm0JhqX7xDXN
 /59DPdGEgZQe5OJ2swh4kqIYlkKLKE6QW+n2ZhUAZzAG08br8h0IE3afap90Lh1M
 E4qS2NpT28ig++FXcfvYUNYHrZzVp/bEsMZjQv9zX76FCsBgjr7FDptm+VyBgL/+
 8PXOcBsBBTdf+hUDO84XV1IWkXi2icOgSRBmY76AYHnCxMguiPnzaKhIG4MnGyyp
 VwkBWm/gjg3dNuO2XhyELdlxw+jO4B6ULrku3oN1NmIpkbEIc4dyVwWRF4dvNq8F
 eFZLbXSAWPDBIB9fLuSbg7YW2f/NFigycQEISzsJrlhXqCTTzkVeBqgJFp9+wFJw
 4Ue+XxrFgz7dW15B4Ggi
 =ohVR
 -----END PGP SIGNATURE-----

Sync with 2.6.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-11-05 12:22:34 -08:00
Junio C Hamano
af40944bda Git 2.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-11-05 12:20:34 -08:00
Junio C Hamano
6c66686e0b Merge branch 'xf/user-manual-markup' into maint 
AsciiDoc markup fixes.

* xf/user-manual-markup:
  Documentation: match undefline with the text in old release notes
  Documentation: match underline with the text
  Documentation: fix header markup
 2015-11-04 14:20:47 -08:00
Junio C Hamano
bc1e0481bf Merge branch 'jc/em-dash-in-doc' into maint 
AsciiDoc markup fixes.

* jc/em-dash-in-doc:
  Documentation: AsciiDoc spells em-dash as double-dashes, not triple
 2015-11-04 14:20:45 -08:00
Junio C Hamano
c29024e5d1 Tenth batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-11-03 15:18:22 -08:00
Junio C Hamano
2635c2b8bf Ninth batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-30 13:17:31 -07:00
Junio C Hamano
80980a1d5c Eighth batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-29 14:02:40 -07:00
Junio C Hamano
73167677c0 Merge branch 'jc/em-dash-in-doc' 
AsciiDoc markup fixes.

* jc/em-dash-in-doc:
  Documentation: AsciiDoc spells em-dash as double-dashes, not triple
 2015-10-29 13:59:16 -07:00
Junio C Hamano
6abe8f4439 Merge branch 'xf/user-manual-markup' 
AsciiDoc markup fixes.

* xf/user-manual-markup:
  Documentation: match undefline with the text in old release notes
  Documentation: match underline with the text
  Documentation: fix header markup
 2015-10-29 13:59:14 -07:00
Junio C Hamano
37023ba381 Seventh batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-26 16:02:08 -07:00
Junio C Hamano
3b19dba703 Documentation: AsciiDoc spells em-dash as double-dashes, not triple 
Again, we do not usually process release notes with AsciiDoc, but it
is better to be consistent.

This incidentally reveals breakages left by an ancient 5e00439f
(Documentation: build html for all files in technical and howto,
2012-10-23).  The index-format documentation was originally written
to be read as straight text without formatting and when the commit
forced everything in Documentation/ to go through AsciiDoc, it did
not do any adjustment--hence the double-dashes will be seen in the
resulting text that is rendered as preformatted fixed-width without
converted into em-dashes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-22 13:02:33 -07:00
Junio C Hamano
77d5f715c2 Documentation: match undefline with the text in old release notes 
These are not processed with AsciiDoc, but it is better to be
consistent.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-22 10:16:17 -07:00
Junio C Hamano
bca92e88e7 Sixth batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-20 15:29:50 -07:00
Junio C Hamano
0c4dd78434 Git 2.6.2 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWIW7HAAoJELC16IaWr+bLrDAP/iyXz6A2ooVM/9/c3XzzZqSk
 njU1C5frBoHHe9Xa/RMTnhVTK8zQLfcjpo2YGuQ+t9rmwKZ045c8EE5o1cx0fc4y
 WFt36rOYirp3m52l95p5EwfRXvHupk9Pk8xsh1j8nuFNKMpDCuhXfY0gLyBlD3Fs
 c8tKzAPgN9wTkZO0RlpKmmVIeI60UTik99fp6Wbc4jovomSH3IK+roEKPXfoqI1m
 l7zrIynDV3POUqLUzTulx9pIjbZpCh+djWOMVPbnoTPR59vZaUScdhyml+iNaLtR
 QGsu8+amzuTz6n/voECKy+v5cyZGWTgsvOcgqP+U+R8wmOjXSy5LANDQ7nq+V0UO
 JZauiUy+KFjeFd7tYq9fRN2XKMkpbDR6ocPLWQ+yJrHXv71ImxG5LpRV9iHbfBdL
 q1jCipsnuvIX0BuOT6EIs7F/dJbvKJlSFXajkokuFmYuIp/nr5zA3dArI9tnkhJ2
 ye8Ck33mR/XeXMXBCLErECFSLRr8QD2TjFipiGa7XT7cIITgVimwRcCJ/86SU9VA
 G9yQ4cdj5exK4/iAG8HpGxN+NwaQvdSD3425Wq4+I0KaGsV6itEXm1WyU1tvqFzj
 HU2hOwiyzCsGG0BX+nmsFa13ALUyqB5saZNrAJjEEJFGmq4MzzEoTXCpOFrTFj/M
 JC9YKCI4Smx4+QtTuzaK
 =ObN4
 -----END PGP SIGNATURE-----

Sync with 2.6.2
 2015-10-16 14:45:49 -07:00
Junio C Hamano
906c32b9c3 Fifth batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-16 14:44:00 -07:00
Junio C Hamano
3c3d3f629a Git 2.6.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-16 14:40:05 -07:00
Junio C Hamano
a838ae9d49 Fourth batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-15 15:48:56 -07:00
Junio C Hamano
b27dacc1a8 Third batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-14 14:31:23 -07:00
Junio C Hamano
f5b6079871 Second batch for 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-07 13:38:43 -07:00
Junio C Hamano
24a00ef646 Start cycle toward 2.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-10-05 13:20:21 -07:00
Junio C Hamano
22f698cb18 Git 2.6.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-28 19:19:34 -07:00
Junio C Hamano
3adc4ec7b9 Sync with v2.5.4 2015-09-28 19:16:54 -07:00
Junio C Hamano
24358560c3 Git 2.5.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-28 15:34:28 -07:00
Junio C Hamano
11a458befc Sync with 2.4.10 2015-09-28 15:33:56 -07:00
Junio C Hamano
a2558fb8e1 Git 2.4.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-28 15:30:30 -07:00
Junio C Hamano
6343e2f6f2 Sync with 2.3.10 2015-09-28 15:28:31 -07:00
Junio C Hamano
18b58f707f Git 2.3.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-28 15:26:52 -07:00
Junio C Hamano
0e5767991b Update RelNotes to 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-17 12:33:24 -07:00
Junio C Hamano
4d8002429f Sync with 2.5.3 
* maint:
  Git 2.5.3
 2015-09-17 12:29:49 -07:00
Junio C Hamano
ee6ad5f4d5 Git 2.5.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-17 12:16:17 -07:00
Junio C Hamano
f4d9753a89 Update RelNotes to 2.6 to describe leftover bits since -rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-14 15:00:41 -07:00
Junio C Hamano
45733fa93f Git 2.6-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-14 13:17:56 -07:00
Junio C Hamano
f0bc854623 Sync with 2.5.2 2015-09-09 14:30:35 -07:00
Junio C Hamano
7a2c4af7a8 Release Notes: typofix 
Thanks to Andreas Schwab for careful reading.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-09 10:34:35 -07:00
Junio C Hamano
27ea6f85be Git 2.5.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-04 10:46:07 -07:00
Junio C Hamano
3d3caf0b78 Sync with 2.4.9 2015-09-04 10:43:23 -07:00
Junio C Hamano
74b6763816 Git 2.4.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-04 10:36:14 -07:00
Junio C Hamano
ef0e938a1a Sync with 2.3.9 2015-09-04 10:34:19 -07:00
Junio C Hamano
ecad27cf98 Git 2.3.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-04 10:32:15 -07:00
Junio C Hamano
8267cd11d6 Sync with 2.2.3 2015-09-04 10:29:28 -07:00
Junio C Hamano
441c4a4017 Git 2.2.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-04 10:26:23 -07:00
Junio C Hamano
16ffa6443e Git 2.6-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-02 12:55:28 -07:00
Junio C Hamano
7aa67f62c7 Ninth batch for 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-09-01 16:31:58 -07:00
Junio C Hamano
16163602ba Eighth batch for 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-31 15:40:24 -07:00
Junio C Hamano
aecce6d0ef Sync with 2.5.1 2015-08-28 12:32:45 -07:00
Junio C Hamano
e6837c8b43 Seventh batch for 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-28 12:32:25 -07:00
Junio C Hamano
c415fb791b Git 2.5.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-28 11:19:57 -07:00
Junio C Hamano
3a9835bf65 Sixth batch for 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-26 15:47:48 -07:00
Junio C Hamano
8da8889a4b Fifth batch for 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-25 15:00:25 -07:00
Junio C Hamano
ff86faf2fa Sync with maint 
* maint:
  Start preparing for 2.5.1
 2015-08-19 14:49:37 -07:00
Junio C Hamano
8f8d0ecfde Fourth batch for 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-19 14:48:57 -07:00
Junio C Hamano
552a736de7 Start preparing for 2.5.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-19 14:48:13 -07:00
Junio C Hamano
44e02239f4 Third batch for 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-17 15:09:25 -07:00
Junio C Hamano
130be8eeb8 Second batch for 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-12 14:16:31 -07:00
Junio C Hamano
efc8a625e9 Sync with maint 
* maint:
  Git 2.4.8
 2015-08-03 11:20:07 -07:00
Junio C Hamano
eb67052b13 First batch for 2.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-03 11:19:36 -07:00
Junio C Hamano
e88b8586bf Sync with 2.4.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-03 10:45:34 -07:00
Junio C Hamano
8545932d45 Git 2.4.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-03 10:43:01 -07:00
Junio C Hamano
7a2c87b152 Sync with 2.4.7 2015-07-27 12:26:40 -07:00
Junio C Hamano
ca00f80b58 Git 2.4.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-07-27 12:25:42 -07:00
Junio C Hamano
6f9504c48e RelNotes: am.threeWay does not exist (yet) 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-07-24 14:31:23 -07:00
Junio C Hamano
6003e7f93a Sync with 2.4.6 2015-07-15 12:32:37 -07:00
Junio C Hamano
bb3e7b1a55 Git 2.4.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-07-15 12:31:07 -07:00
Junio C Hamano
01977f46cb Git 2.5.0-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-07-13 14:04:30 -07:00
Junio C Hamano
e59f6c2d34 The last minute bits of fixes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-07-10 14:29:00 -07:00
Junio C Hamano
cbed29f37b Git 2.5.0-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-07-01 14:05:33 -07:00
Junio C Hamano
7ecec52d42 Git 2.5.0-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-25 11:08:39 -07:00
Junio C Hamano
a6a1ad9b25 Sync with 2.4.5 2015-06-25 11:04:30 -07:00
Junio C Hamano
0df0541bf1 Git 2.4.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-25 11:03:05 -07:00
Junio C Hamano
df97e5dfea Ninth batch for 2.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-24 12:27:20 -07:00
Junio C Hamano
16da57c7c6 Eighth batch for 2.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-16 14:39:31 -07:00
Junio C Hamano
5c040f5af5 Sync with 2.4.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-16 14:39:01 -07:00
Junio C Hamano
f09bd215cd Git 2.4.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-16 14:38:01 -07:00
Junio C Hamano
a5fe66802f Second half of seventh batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-11 09:35:25 -07:00
Junio C Hamano
7974889a05 Sync with 2.4.3 2015-06-05 12:23:18 -07:00
Junio C Hamano
69f9a6e54a Git 2.4.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-05 12:22:33 -07:00
Junio C Hamano
f1673dc474 The first half of the seventh batch for 2.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-05 12:20:57 -07:00
Junio C Hamano
f86f31ab33 Sixth batch for 2.5 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-06-01 12:47:56 -07:00
Junio C Hamano
fae46aa0ae Sync with 2.4.2 2015-05-26 13:50:51 -07:00
Junio C Hamano
9eabf5b536 Git 2.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-05-26 13:49:59 -07:00
Junio C Hamano
4ebdeb68ba Fifth batch for 2.5 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-05-26 13:33:35 -07:00
Junio C Hamano
9532ead987 Fourth batch for 2.5 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-05-22 12:53:21 -07:00
Junio C Hamano
6c1249c503 Third batch for 2.5 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-05-19 13:24:08 -07:00
Junio C Hamano
1ea28e1494 Sync with 2.4.1 
* maint:
  Git 2.4.1
 2015-05-13 14:35:05 -07:00
Junio C Hamano
aaa7e0d7f8 Git 2.4.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-05-13 14:11:43 -07:00
Junio C Hamano
c518059b26 Merge branch 'maint' 
* maint:
  Git 2.3.8
 2015-05-11 14:39:39 -07:00
Junio C Hamano
c99fec6e35 Sync with 2.3.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-05-11 14:39:28 -07:00
Junio C Hamano
9a3d637541 Git 2.3.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-05-11 14:36:31 -07:00
Junio C Hamano
22aca1b3ac Second batch for 2.5 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-05-11 14:31:28 -07:00
Junio C Hamano
8440f74997 First batch for 2.5 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-05-05 21:13:30 -07:00
Junio C Hamano
fb3e7d5515 Sync with 2.3.7 2015-04-27 12:26:21 -07:00
Junio C Hamano
16018ae5fb Git 2.3.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-04-27 12:25:36 -07:00
Michael Haggerty
6eb1401375 RelNotes: wordsmithing 
Make many textual tweaks to the 2.4.0 release notes.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-04-23 11:32:08 -07:00
Michael Haggerty
2eac0356b0 RelNotes: refer to the rebase -i "todo list", not "insn sheet" 
"Todo list" is the name that is used in the user-facing documentation.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-04-23 11:32:05 -07:00
Michael Haggerty
37f4bed11b RelNotes: correct name of versionsort.prereleaseSuffix 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-04-23 11:29:22 -07:00
Junio C Hamano
fb896362cc Sync with maint 2015-04-21 12:58:50 -07:00
Junio C Hamano
ba63bfaa59 Git 2.3.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-04-21 12:17:09 -07:00
Junio C Hamano
ef05a39fa0 RelNotes: "merge --quiet" change has been reverted 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-04-21 11:09:19 -07:00
Junio C Hamano
7c597ef345 Hopefully the last batch for 2.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-04-20 15:30:13 -07:00
Junio C Hamano
e46fe3df01 Git 2.4.0-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-04-14 11:57:13 -07:00
Junio C Hamano
6ae0d97266 Git 2.4.0-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-04-02 12:46:06 -07:00
Junio C Hamano
cf8a8c6bd5 Sync with 2.3.5 
* maint:
  Git 2.3.5
  docs: clarify what git-rebase's "-p" / "--preserve-merges" does
 2015-03-31 14:58:38 -07:00
Junio C Hamano
52735a6892 Git 2.3.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-31 14:57:10 -07:00
Junio C Hamano
a3b75b3ccb Sync with maint 
* maint:
  Prepare for 2.3.5
  2.3.2 release notes: typofix
 2015-03-28 09:42:49 -07:00
Junio C Hamano
9e4ab3a4f5 RelNotes: minor doc updates 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-28 09:41:51 -07:00
Junio C Hamano
2c97724d5e Prepare for 2.3.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-28 09:36:30 -07:00
Thomas Ackermann
b37996e251 2.3.2 release notes: typofix 
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-28 09:29:29 -07:00
Junio C Hamano
2dfb2e07cb Git 2.4.0-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-26 11:59:05 -07:00
Junio C Hamano
bca181109d Getting ready for -rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-25 13:01:07 -07:00
Junio C Hamano
f53fc38c08 Sync with v2.3.4 2015-03-23 11:37:49 -07:00
Junio C Hamano
9b22801c18 Post 2.3 cycle (batch #12) 
Hopefully with another batch or two, we would be ready for -rc0
to close this cycle.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-23 11:36:01 -07:00
Junio C Hamano
3a52578eef Git 2.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-23 11:27:27 -07:00