mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-16 06:03:44 +01:00
Code Activity
35708 commits 6 branches 956 tags 519 MiB
Commit graph

588 commits

Author SHA1 Message Date
Junio C Hamano
173f9a7145 Update draft release notes to 1.8.2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-24 16:22:07 -07:00
Junio C Hamano
562af5b0b9 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-23 11:27:15 -07:00
Junio C Hamano
118f60ee06 Sync with maint 2013-04-22 11:33:31 -07:00
Junio C Hamano
3e7bb5da9f Start preparing for 1.8.2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-22 11:32:58 -07:00
Junio C Hamano
3d88f83db2 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-22 11:18:43 -07:00
Junio C Hamano
d2949c7b3c Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-19 13:53:44 -07:00
Junio C Hamano
1468a58393 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-18 12:03:09 -07:00
Junio C Hamano
aec3f77941 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-15 12:45:15 -07:00
Junio C Hamano
7ece7ee607 Update dtaft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-11 17:41:14 -07:00
Junio C Hamano
52a3e011c7 Sync with 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-07 15:28:50 -07:00
Junio C Hamano
5bda18c186 Git 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-07 15:27:23 -07:00
Junio C Hamano
c17b651f19 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-07 14:40:26 -07:00
Junio C Hamano
6466fbbeef Sync with 1.8.1.6 2013-04-07 13:17:50 -07:00
Junio C Hamano
2137ce01f8 Git 1.8.1.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-07 08:58:30 -07:00
Junio C Hamano
21ccebec0d Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-05 14:19:57 -07:00
Junio C Hamano
8d994db46e Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-03 09:44:50 -07:00
Junio C Hamano
260dba5d49 Sync with maint 2013-04-03 09:44:34 -07:00
Junio C Hamano
19534ee8a7 Update draft release notes to 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-03 09:29:14 -07:00
Junio C Hamano
92e0d91632 Sync with 1.8.1 maintenance track 
* maint-1.8.1:
  Start preparing for 1.8.1.6
  git-tag(1): we tag HEAD by default
  Fix revision walk for commits with the same dates
  t2003: work around path mangling issue on Windows
  pack-refs: add fully-peeled trait
  pack-refs: write peeled entry for non-tags
  use parse_object_or_die instead of die("bad object")
  avoid segfaults on parse_object failure
  entry: fix filter lookup
  t2003: modernize style
  name-hash.c: fix endless loop with core.ignorecase=true
 2013-04-03 09:18:01 -07:00
Junio C Hamano
072dda68ea Start preparing for 1.8.1.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-03 09:12:11 -07:00
Junio C Hamano
961c5129d5 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-02 15:14:26 -07:00
Junio C Hamano
cc3e4eba72 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-01 09:24:56 -07:00
Junio C Hamano
b442731638 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.8.2.1
 2013-04-01 09:23:30 -07:00
Junio C Hamano
40a0f842da Update draft release notes to 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-01 09:23:05 -07:00
Junio C Hamano
8617715cc0 Merge branch 'maint' 
* maint:
  More fixes for 1.8.2.1
  merge-tree: fix typo in merge-tree.c::unresolved
  git-commit doc: describe use of multiple `-m` options
  git-pull doc: fix grammo ("conflicts" is plural)
 2013-03-27 10:58:07 -07:00
Junio C Hamano
9a82efd0d2 More fixes for 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-27 10:57:57 -07:00
Junio C Hamano
2bba2f0e65 More topics from the second batch for 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-26 13:16:11 -07:00
Junio C Hamano
7f95f2dce0 Merge branch 'maint' 
* maint:
  More corrections for 1.8.2.1
  Correct the docs about GIT_SSH.
 2013-03-26 13:14:45 -07:00
Junio C Hamano
3bbbf18d71 More corrections for 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-26 13:14:20 -07:00
Junio C Hamano
7632cd2744 Second wave of topics toward 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-25 14:08:00 -07:00
Junio C Hamano
cd04c522bd Merge branch 'maint' 
* maint:
  Start preparing for 1.8.2.1
  transport.c: help gcc 4.6.3 users by squelching compiler warning
 2013-03-25 13:52:25 -07:00
Junio C Hamano
1252f8b29f Start preparing for 1.8.2.1 
... at the same time, preparation for 1.8.1.6 also has started ;-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-25 13:51:13 -07:00
Junio C Hamano
7b592fadf1 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-21 15:29:42 -07:00
Junio C Hamano
7b9a41987a The first wave of topics for 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-19 12:30:28 -07:00
Junio C Hamano
048d4d98b3 Start the post 1.8.2 cycle 
Again, tentatively let's call this cycle 1.8.3.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-18 15:01:19 -07:00
Junio C Hamano
3e714cdbab Update draft release notes to 1.8.2 
Split the backward-compatibility notes into two sections, the ones
that affect this release, and the other to describe changes meant
for Git 2.0.  The latter gives a context to understand why the
changes for this release is necessary.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-08 14:14:27 -08:00
Junio C Hamano
4d0d0c3c59 Git 1.8.2-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-03 01:24:11 -08:00
Junio C Hamano
06d67b8766 Sync with 1.8.1.5 2013-03-01 13:17:18 -08:00
Junio C Hamano
e6363a4992 Git 1.8.1.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-01 13:15:29 -08:00
Junio C Hamano
443d803e0d Merge branch 'maint' 
* maint:
  Update draft release notes to 1.8.1.5
  Documentation/submodule: Add --force to update synopsis
 2013-02-27 10:10:28 -08:00
Junio C Hamano
8d44277d91 Update draft release notes to 1.8.1.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-27 10:09:59 -08:00
Junio C Hamano
4dac0679fe Git 1.8.2-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-25 09:03:26 -08:00
Junio C Hamano
2a4a26b53d Sync with 'maint' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-25 08:28:06 -08:00
Junio C Hamano
7a0d8db36e Prepare for 1.8.1.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-25 08:26:25 -08:00
Junio C Hamano
b3600c3628 Sync with v1.8.1.4 2013-02-19 21:57:27 -08:00
Junio C Hamano
dff9f8835f Git 1.8.1.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-19 21:54:22 -08:00
Junio C Hamano
ce209d0c72 RelNotes 1.8.2: push-simple will not be in effect in this release 
Also migration path for the default behaviour of "git add -u/-A" run
in a subdirectory is worth mentioning.

Both pointed out by Matthieu Moy.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-18 15:59:33 -08:00
Junio C Hamano
004825d314 Git 1.8.2-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-17 15:35:33 -08:00
Junio C Hamano
7b6e784d70 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-15 12:24:54 -08:00
Junio C Hamano
02339dd529 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-14 10:43:07 -08:00
Junio C Hamano
aa3982890f Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-10 20:47:28 -08:00
Junio C Hamano
a923c314aa Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-07 15:25:06 -08:00
Junio C Hamano
c86223b272 Sync with 1.8.1.3 2013-02-07 15:21:49 -08:00
Junio C Hamano
f350082525 Git 1.8.1.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-07 15:21:10 -08:00
Junio C Hamano
2f19ada7f8 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-05 16:20:16 -08:00
Junio C Hamano
f51a757faf Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-04 10:44:26 -08:00
Junio C Hamano
4c2c5537c3 Merge branch 'maint' 
* maint:
  Start preparing for 1.8.1.3
 2013-02-04 10:26:11 -08:00
Junio C Hamano
42f50f8d01 Start preparing for 1.8.1.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-04 10:21:10 -08:00
Junio C Hamano
bcd45b4085 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-01 12:52:08 -08:00
Junio C Hamano
08c0e7fd4a Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-28 11:19:59 -08:00
Junio C Hamano
0fdd7f5d73 Sync with 1.8.1.2 2013-01-28 11:18:32 -08:00
Junio C Hamano
53cdd4e1b2 Git 1.8.1.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-28 11:17:54 -08:00
Junio C Hamano
3587b513ba Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-25 12:52:55 -08:00
Junio C Hamano
c4ada6283e Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-22 10:01:05 -08:00
Junio C Hamano
fe73786b48 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-20 17:28:13 -08:00
Junio C Hamano
57a011197e Merge branch 'maint' 2013-01-20 17:27:27 -08:00
Junio C Hamano
74f3267b0c Start preparing for 1.8.1.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-20 17:26:04 -08:00
Junio C Hamano
bbc6f64b4e Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-18 11:26:11 -08:00
Junio C Hamano
eacf011775 Sync with 1.8.1.1 2013-01-14 08:22:27 -08:00
Junio C Hamano
77d07f51df Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-14 08:21:35 -08:00
Junio C Hamano
e4f59a32de Git 1.8.1.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-14 08:04:50 -08:00
Junio C Hamano
94702dd1ac Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-11 18:51:09 -08:00
Junio C Hamano
a27d83aee9 Merge branch 'maint' 
* maint:
  Prepare for 1.8.1.1
  Makefile: detect when PYTHON_PATH changes (cherry-picked)
 2013-01-10 14:38:00 -08:00
Junio C Hamano
99621af877 Update draft release notes to 1.8.2 2013-01-10 14:36:23 -08:00
Junio C Hamano
bf7c3f749d Prepare for 1.8.1.1 2013-01-10 14:17:13 -08:00
Junio C Hamano
44fe83502e Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-09 10:19:49 -08:00
Junio C Hamano
32238aeb73 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-06 00:17:24 -08:00
Junio C Hamano
3e293fba62 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-03 10:33:22 -08:00
Junio C Hamano
298caa7e9e Start 1.8.2 cycle 
Various fixes that have been cooking in 'next' have been merged. All
of them should go to 'maint' for 1.8.1.1 later.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-02 10:56:08 -08:00
Junio C Hamano
5d417842ef Git 1.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-12-31 14:25:57 -08:00
Junio C Hamano
1b800f8f50 Sync with 1.8.0.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-12-27 15:59:42 -08:00
Junio C Hamano
15999998fb Git 1.8.0.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-12-27 15:57:20 -08:00
Junio C Hamano
2e900297db Git 1.8.1-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-12-15 11:19:02 -08:00
Junio C Hamano
816f290752 Git 1.8.1-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-12-07 15:17:21 -08:00
Junio C Hamano
5a2c11b6db Merge branch 'maint' 
* maint:
  Update draft release notes to 1.8.0.2
 2012-12-07 14:16:52 -08:00
Junio C Hamano
a859d3ee57 Update draft release notes to 1.8.0.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-12-07 14:16:38 -08:00
Junio C Hamano
ee26a6e2b8 Git 1.8.1-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-12-03 09:49:51 -08:00
Junio C Hamano
f94c3251e1 Update draft release notes to 1.8.1 2012-11-29 13:57:09 -08:00
Junio C Hamano
226dcb5256 Merge branch 'maint' 2012-11-28 13:49:33 -08:00
Junio C Hamano
8f8af9f4d1 Update draft release notes to 1.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-11-28 13:49:10 -08:00
Junio C Hamano
93341d805f Start preparing for 1.8.0.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-11-28 13:40:02 -08:00
Junio C Hamano
e8a1f5a2ae Update draft release notes to 1.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-11-25 18:52:42 -08:00
Junio C Hamano
f9b329a7d1 Sync with 1.8.0.1 2012-11-25 18:40:55 -08:00
Junio C Hamano
ed9fe75513 Git 1.8.0.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-11-25 18:40:34 -08:00
Junio C Hamano
2d242fb3fc Update draft release notes for 1.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-11-21 13:32:58 -08:00
Junio C Hamano
3a189da601 Sixth batch for 1.8.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-11-20 10:46:29 -08:00
Junio C Hamano
80dfab86cd Sync with maint 
* maint:
  Further preparation for 1.8.0.1
 2012-11-20 10:16:34 -08:00
Junio C Hamano
1c03999bef Further preparation for 1.8.0.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-11-20 10:16:14 -08:00
Junio C Hamano
f3828dc066 Sync with maint 2012-11-18 19:48:31 -08:00
Junio C Hamano
2808f6abc2 Start preparing for 1.8.0.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-11-18 19:47:19 -08:00
Junio C Hamano
5a90748f28 Start 1.8.1 cycle 
Prepare the release notes for the upcoming release, and describe
changes up to the 5th batch we just merged.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-11-15 11:21:47 -08:00
Junio C Hamano
8c7a786b6c Git 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-21 13:56:23 -07:00
Junio C Hamano
87a5461fa7 Git 1.8.0-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-17 10:39:44 -07:00
Junio C Hamano
d2bfef22e4 Sync with 1.7.12.4 2012-10-17 10:37:32 -07:00
Junio C Hamano
7e2010537e Git 1.7.12.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-17 10:36:42 -07:00
Thomas Ackermann
d25c58ce43 Documentation/RelNotes: remove "updated up to this revision" markers 
These were used to keep track of the last commit a release notes
entry was written for, and should have been removed when cutting
the final release.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-16 15:35:00 -07:00
Junio C Hamano
4a182f6174 Update draft release notes to 1.8.0 
We are almost there...

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-16 13:27:23 -07:00
Junio C Hamano
4c6c949c7d Git 1.8.0-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-08 11:45:41 -07:00
Junio C Hamano
5a333adeb5 Sync with 1.7.12.3 2012-10-08 11:41:21 -07:00
Junio C Hamano
234cd45662 Git 1.7.12.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-08 11:40:43 -07:00
Junio C Hamano
f84667def2 Update draft release notes to 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-02 21:18:40 -07:00
Junio C Hamano
b65f30b6b3 Merge branch 'maint' 2012-10-02 13:47:30 -07:00
Junio C Hamano
9376c8603f Start preparing for 1.7.12.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-02 13:44:59 -07:00
Michael J Gruber
d117dd2096 RelNotes/1.8.0: various typo and style fixes 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-02 10:17:25 -07:00
Junio C Hamano
b0ec16b49e Git 1.8.0-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-10-01 13:09:47 -07:00
Junio C Hamano
f65ed83c7e Update draft release notes to 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-29 23:25:09 -07:00
Junio C Hamano
28de297ffe Sync with 1.7.12.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-29 23:22:53 -07:00
Junio C Hamano
d8cf053dac Git 1.7.12.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-29 23:20:47 -07:00
Junio C Hamano
652398a88e Update draft release notes to 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-25 10:44:32 -07:00
Junio C Hamano
b5d156c362 Sync with maint 2012-09-24 12:50:36 -07:00
Junio C Hamano
1a002c73ba Start preparation for 1.7.12.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-24 12:50:00 -07:00
Junio C Hamano
b0576a6a6d Update draft release notes to 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-18 14:43:12 -07:00
Junio C Hamano
3c7d50979a Sync with 1.7.12.1 2012-09-18 14:35:03 -07:00
Junio C Hamano
304b7d99a7 Git 1.7.12.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-18 14:34:31 -07:00
Junio C Hamano
5976753e73 The seventh batch for 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-17 16:00:39 -07:00
Junio C Hamano
83379df025 Draft release notes to 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-14 21:44:37 -07:00
Junio C Hamano
66c349027b Merge branch 'maint' 2012-09-14 21:38:20 -07:00
Junio C Hamano
d4d39bc32d Draft release notes to 1.7.12.1 
We are almost there...

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-14 21:37:51 -07:00
Junio C Hamano
c336bc104c Sync with 1.7.11.7 2012-09-14 21:20:40 -07:00
Junio C Hamano
bafc478f16 Git 1.7.11.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-14 20:57:23 -07:00
Junio C Hamano
1084f3b844 The sixth batch for 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-14 12:34:11 -07:00
Junio C Hamano
6b149cee20 Start merging the sixth batch for 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-12 14:37:07 -07:00
Junio C Hamano
0577c59af8 Merge branch 'maint' 2012-09-12 14:36:39 -07:00
Junio C Hamano
e70d1632bd Further merging in preparation for 1.7.12.1 
Describe the following in the draft release notes:

 . jc/apply-binary-p0
 . jc/dotdot-is-parent-directory
 . jc/maint-doc-checkout-b-always-takes-branch-name
 . jk/maint-http-half-auth-push
 . kk/maint-for-each-ref-multi-sort

Yet to be merged before 1.7.12.1 are:

 . jk/config-warn-on-inaccessible-paths
 . jk/maint-quiet-is-synonym-to-s-in-log
 . mz/cherry-pick-cmdline-order

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-12 14:12:48 -07:00
Junio C Hamano
53284de777 Second half of the fifth batch for 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-11 11:41:35 -07:00
Junio C Hamano
04f4262466 Sync with maint 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-11 11:31:41 -07:00
Junio C Hamano
cbd6b089e8 Further merging down for 1.7.12.1 
We will wait for a handful of other fixes that have graduated to the
'master' for 1.8.0 to be tested in the wild and then tag 1.7.12.1:

 . mz/cherry-pick-cmdline-order
 . jk/maint-quiet-is-synonym-to-s-in-log
 . jk/maint-http-half-auth-push
 . jc/apply-binary-p0
 . jk/config-warn-on-inaccessible-paths
 . kk/maint-for-each-ref-multi-sort

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-11 11:27:35 -07:00
Junio C Hamano
1c88a6d174 Sync with 1.7.11.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-11 11:23:54 -07:00
Junio C Hamano
e09e4024a0 Git 1.7.11.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-11 11:18:48 -07:00
Junio C Hamano
682ce8bb37 First half of the fifth batch for 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-10 15:52:21 -07:00
Junio C Hamano
780ded430a Cull items fixed in maintenance branches 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-10 15:41:14 -07:00
Junio C Hamano
e7ff66b5ef Sync with "almost" 1.7.12.1 2012-09-10 15:40:07 -07:00
Junio C Hamano
23193cfd51 Start preparing for 1.7.12.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-10 15:39:15 -07:00
Junio C Hamano
e3f26752b5 Merge branch 'maint-1.7.11' into maint 
* maint-1.7.11:
  Almost 1.7.11.6
  gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
  rebase -i: use full onto sha1 in reflog
  sh-setup: protect from exported IFS
  receive-pack: do not leak output from auto-gc to standard output
  t/t5400: demonstrate breakage caused by informational message from prune
  setup: clarify error messages for file/revisions ambiguity
  send-email: improve RFC2047 quote parsing
  fsck: detect null sha1 in tree entries
  do not write null sha1s to on-disk index
  diff: do not use null sha1 as a sentinel value
 2012-09-10 15:31:06 -07:00
Junio C Hamano
9a8eea9604 Almost 1.7.11.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-10 15:30:46 -07:00
Junio C Hamano
0ce9864461 The fourth batch for 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-07 11:25:22 -07:00
Junio C Hamano
a2e78c2d87 The third batch for 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-09-03 16:23:44 -07:00
Junio C Hamano
16d26b168b Latter half of the second batch for 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-29 15:00:30 -07:00
Junio C Hamano
31e0100e89 First half of the second batch for 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-27 12:10:07 -07:00
Junio C Hamano
efa646213a Merge branch 'maint' 
* maint:
  Prepare for 1.7.11.6
  Make the ciabot scripts completely self-configuring in the normal case.
  Improved documentation for the ciabot scripts.
 2012-08-24 13:13:53 -07:00