mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 06:47:52 +01:00
Code Activity
36583 commits 6 branches 956 tags 474 MiB
Commit graph

628 commits

Author SHA1 Message Date
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
Junio C Hamano
871e293c9a Merge branch 'maint-1.7.11' into maint 
* maint-1.7.11:
  Prepare for 1.7.11.6
  Make the ciabot scripts completely self-configuring in the normal case.
  Improved documentation for the ciabot scripts.
  man: git pull -r is a short for --rebase
  gitcli: describe abbreviation of long options
  rev-list docs: clarify --topo-order description
  Documentation/CodingGuidelines: spell out more shell guidelines
  Documentation: do not mention .git/refs/* directories
  tests: Introduce test_seq
 2012-08-24 12:34:19 -07:00
Junio C Hamano
b52183179b Prepare for 1.7.11.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-24 12:33:31 -07:00
Junio C Hamano
851f7e689e Kick off cycle towards 1.8.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-22 11:54:47 -07:00
Junio C Hamano
2a9a19e1b1 Git 1.7.12-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-15 13:46:16 -07:00
Junio C Hamano
47e32d071e Sync with 1.7.11.5 2012-08-15 13:41:17 -07:00
Junio C Hamano
cd7c0be19f Git 1.7.11.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-15 13:39:53 -07:00
Junio C Hamano
e15c16de39 Git 1.7.12-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-07 10:39:34 -07:00
Junio C Hamano
b1d9b1d0f1 Drop 1.7.11.x items from 1.7.12 release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-06 15:58:38 -07:00
Junio C Hamano
9ffdd46ae4 Sync with maint 2012-08-06 15:53:33 -07:00
Junio C Hamano
b17a01df49 Prepare for 1.7.11.5 
Hopefully that will be the final 1.7.11.x maintenance release.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-08-06 15:51:58 -07:00
Junio C Hamano
3b2d763db0 Git 1.7.12-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-30 13:20:00 -07:00
Junio C Hamano
9c9b9ede90 Sync with 1.7.11.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-30 13:18:18 -07:00
Junio C Hamano
0e4c8822e9 Git 1.7.11.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-30 13:16:51 -07:00
Junio C Hamano
9e2116adbe Update draft release notes to 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-27 22:25:19 -07:00
Junio C Hamano
476109fa4c Update draft release notes to 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-24 14:08:43 -07:00
Junio C Hamano
ccc1188fa3 Git 1.7.12-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-23 21:02:06 -07:00
Junio C Hamano
e771946915 Update draft release notes to 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-22 13:20:24 -07:00
Junio C Hamano
4a5b324031 Sync with 1.7.11.3 2012-07-22 13:08:22 -07:00
Junio C Hamano
e6dfbcf12b Git 1.7.11.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-22 13:07:40 -07:00
Junio C Hamano
31c79549b8 Update draft release notes for 7th batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-15 21:46:26 -07:00
Junio C Hamano
48c42ff662 Sixth batch for 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-13 15:48:50 -07:00
Junio C Hamano
2b53359290 Reduce draft release notes to 1.7.12 
Many "fixes since 1.7.11" items are now in the maintenance track

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-11 13:48:57 -07:00
Junio C Hamano
d5c771e234 Sync with 1.7.11.2 2012-07-11 13:00:51 -07:00
Junio C Hamano
8d141a1d56 Git 1.7.11.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-11 12:59:41 -07:00
Junio C Hamano
2a4dd9333b Fifth batch for 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-09 09:49:44 -07:00
Junio C Hamano
8228a23b35 Fourth batch for 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-07-04 23:48:37 -07:00
Junio C Hamano
e7b44f182b Third batch for 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-28 15:35:37 -07:00
Junio C Hamano
bc9e7dd41f Second batch for 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-25 11:31:07 -07:00
Junio C Hamano
0e18bef7e6 Sync with 1.7.11.1 2012-06-21 14:52:23 -07:00
Junio C Hamano
157a282401 The first batch for 1.7.12 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-21 14:51:39 -07:00
Junio C Hamano
0e64a95ae5 Git 1.7.11.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-21 14:43:59 -07:00
Junio C Hamano
0ce2e396ee Git 1.7.11 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-17 14:07:15 -07:00
Junio C Hamano
a890c998de Sync with 1.7.10.5 2012-06-17 14:05:53 -07:00
Junio C Hamano
785ee4960c Git 1.7.10.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-17 14:04:15 -07:00
Junio C Hamano
9bea2b5896 Git 1.7.11-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-12 09:10:52 -07:00
Junio C Hamano
a1a031d935 Git 1.7.11-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-07 09:14:41 -07:00
Junio C Hamano
3fe4498197 Git 1.7.11-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-03 15:56:05 -07:00
Junio C Hamano
47829ed010 Sync with 1.7.10.4 
* maint:
  Git 1.7.10.4
 2012-06-03 15:54:33 -07:00
Junio C Hamano
121f71f0da Git 1.7.10.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-03 15:53:58 -07:00
Junio C Hamano
5498c5f052 Update draft release notes to 1.7.11 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-01 13:29:48 -07:00
Junio C Hamano
2c4888efbc Sync with maint 2012-06-01 13:26:16 -07:00
Junio C Hamano
6a6d72b199 Start preparing for 1.7.10.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-06-01 13:23:11 -07:00
Junio C Hamano
befc5ed379 Git 1.7.11-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-25 12:19:45 -07:00
Junio C Hamano
4f64464023 Sync with 1.7.10.3 2012-05-25 11:36:25 -07:00
Junio C Hamano
26e5c5d093 Git 1.7.10.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-25 11:28:43 -07:00
Junio C Hamano
5bc2dc29d4 Sync with maint 
By Jeff King (1) and Junio C Hamano (1)
* maint:
  Update draft release notes to 1.7.10.3
  osxkeychain: pull make config from top-level directory
 2012-05-24 17:37:40 -07:00
Junio C Hamano
c4649188e9 Update draft release notes to 1.7.10.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-24 17:37:29 -07:00
Junio C Hamano
bd578b507f Update draft release notes to 1.7.11 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-23 13:54:23 -07:00
Junio C Hamano
6a4a482229 Update draft release notes for 12th batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-14 12:20:46 -07:00
Junio C Hamano
3f8acaae8a Sync with maint 2012-05-14 11:50:20 -07:00
Junio C Hamano
5bed9f6a61 Start preparing for 1.7.10.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-14 11:47:20 -07:00
Junio C Hamano
cd07cc5312 Update draft release notes to 1.7.11 (11th batch) 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-11 11:40:43 -07:00
Junio C Hamano
0ef576d308 Sync with 1.7.10.2 2012-05-11 11:29:02 -07:00
Junio C Hamano
b6555d731e Git 1.7.10.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-11 11:25:28 -07:00
Junio C Hamano
b7fbce05e5 The tenth batch of topics 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-10 11:04:31 -07:00
Junio C Hamano
2c78c91db7 Merge branch 'maint' 2012-05-10 10:45:47 -07:00
Junio C Hamano
5ad3e16a6f Update draft release notes to 1.7.10.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-10 10:45:42 -07:00
Junio C Hamano
a3935e6791 The ninth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-07 13:39:38 -07:00
Junio C Hamano
ad799ea375 Sync with maint 2012-05-07 13:28:34 -07:00
Junio C Hamano
42325fb2e0 Start preparing for 1.7.10.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-07 13:24:32 -07:00
Junio C Hamano
34875f4a53 The eighth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-02 14:38:43 -07:00
Junio C Hamano
07bc4f5870 Sync with v1.7.10.1 2012-05-01 21:21:46 -07:00
Junio C Hamano
bf505158d0 Git 1.7.10.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-05-01 21:18:44 -07:00
Junio C Hamano
10d4332e00 The seventh batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-29 18:00:47 -07:00
Junio C Hamano
62bc83349d The sixth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-27 14:12:56 -07:00
Junio C Hamano
010b260e6f Update draft release notes to 1.7.11 
A handful of topics have been merged to maintenance releases, and
the first half of 6th batch graduates to 'master'.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 11:04:41 -07:00
Junio C Hamano
210a75c38c Merge bundle error message fix in 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 10:55:08 -07:00
Junio C Hamano
868d662399 Start preparing for 1.7.10.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 10:53:55 -07:00
Junio C Hamano
50bf38ac23 Sync with 1.7.9.7 2012-04-26 10:31:43 -07:00
Junio C Hamano
d0f1ea6003 Git 1.7.9.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 10:23:15 -07:00
Junio C Hamano
b2bab5b338 Sync with 1.7.8.6 2012-04-26 10:22:20 -07:00
Junio C Hamano
d9f5ef7a4a Git 1.7.8.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 10:14:45 -07:00
Junio C Hamano
aba5f57c8f Sync with 1.7.7.7 2012-04-26 09:52:33 -07:00
Junio C Hamano
8258858493 Git 1.7.7.7 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-26 09:41:52 -07:00
Junio C Hamano
f9d995d5dd The fifth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-24 14:50:06 -07:00
Junio C Hamano
aa39b858a3 RelNotes: the fourth batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-23 13:30:22 -07:00
Junio C Hamano
d1ca788fcd RelNotes: the third batch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-20 15:58:40 -07:00
Junio C Hamano
0bb2ee1b7d RelNotes: the second batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-16 12:55:11 -07:00
Junio C Hamano
146fe8ce24 RelNotes: the first batch of topics graduated to 'master' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-15 22:59:31 -07:00
Junio C Hamano
36e6c803a1 Kick off post 1.7.10 cycle 
I tentatively named the release notes "1.7.11" but this may have to
be renamed to "1.8" or some other name later.  Let's see how well
we would do during this cycle.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-11 12:17:17 -07:00
Junio C Hamano
e8dde3e5f9 Git 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-06 10:47:58 -07:00
Junio C Hamano
e5056c05ec Git 1.7.10-rc4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-03 09:30:58 -07:00
Junio C Hamano
d82829b612 Sync with 1.7.9.6 2012-04-02 13:11:49 -07:00
Junio C Hamano
cb2ed324fc Git 1.7.9.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-04-02 13:07:58 -07:00
Junio C Hamano
455cf268db Git 1.7.10-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-28 11:18:42 -07:00
Junio C Hamano
fae9d761c7 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-26 12:38:34 -07:00
Junio C Hamano
ee459baa5c Git 1.7.9.5 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcMOYAAoJELC16IaWr+bLGoQP/2nHXaa6SBovRWgjDpqlVCdI
 xzrUmpkDre5fqTwxuvXF2xfCXT+vzO5kI/pxI58IVlrp9AueVyalkP0M1kJWPMMw
 1esBc4N9Hgc9N3tDDLYOSeJTwozoqv5fiv+Kexecpc1nguP3fEgLfPcjQ9LFb9s3
 pGMr1FroqnX3TLKlcHB3FFO/0fojMtZ+NJOOFV8rCqe+0khcy41+f2FeGL/6eLja
 kTnfC+WewoUcSKjAUd19xPk+QZ0xVh69/aV4jv64mpBcFPTv/8YJTOp5A6d5I/UP
 adoH64rG6h8B4SpUOIHubXpLC5XdDYkinjnSOKkMiSeolPJPInSuS4pZy86YWpYt
 pKEI3/rxh/TbK7F9LnJhunbPX6j2MpZywIt7/ux8idwjyU7z/IRTeetrqRhG1Pno
 av3Fgez/gNOPSDiABEv9Kn3QLSj4IfHCtT+Ih7ejzKk8sCCCFCucueINsdl6EVni
 sQRN1E+UKcRUhIIdPZWvwop6IzbFGCkqFthup2gOiAZfZj9j27Ht1TOl7vDWvsOK
 +Vlff+kzJIXxbiiXhjVAX3RjAKj8Dq0jILXhmu6p60e6FkQuLwN/YcMKhwW1IJgq
 58g22g6CAIgXeItttCdv690qVM3KE7c+sR3S1aJyQdzDsBu1J5wPTUmeY5aBjQGZ
 1kHlftCTxQ5H8HFRmURT
 =pq47
 -----END PGP SIGNATURE-----

Sync with 1.7.9.5
 2012-03-26 12:30:51 -07:00
Junio C Hamano
8ced9c90a2 Git 1.7.9.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-26 12:29:25 -07:00
Junio C Hamano
c16df57c5a Git 1.7.10-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-23 15:11:24 -07:00
Junio C Hamano
bc62ca13c0 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-16 08:42:22 -07:00
Junio C Hamano
0e2d57fd50 Git 1.7.10-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-14 15:47:45 -07:00
Junio C Hamano
6c15a1c636 am: officially deprecate -b/--binary option 
We have had these options as harmless no-op for more than 3 years without
officially deprecating them.  Let's announce the deprecation and start
warning against their use, but without failing the command just not yet,
so that we can later repurpose the option if we want to in the future.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-13 12:21:04 -07:00
Junio C Hamano
fa678feb7c Update draft release notes to 1.7.10 before -rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-12 15:59:06 -07:00
Junio C Hamano
3101a748dc Sync with 1.7.9.4 2012-03-12 15:54:21 -07:00
Junio C Hamano
a46034819e Git 1.7.9.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-12 15:52:52 -07:00
Junio C Hamano
42e52e358b Update draft release notes to 1.7.10 
Also apply typofixes people on the list helped spotting and
correcting.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-08 13:08:54 -08:00
Junio C Hamano
56a33c8f1b Git 1.7.10-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-07 12:51:55 -08:00
Junio C Hamano
4a92a17214 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-04 23:38:02 -08:00
Junio C Hamano
91527e54d5 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.9.3 for the last time
  http.proxy: also mention https_proxy and all_proxy
  t0300: work around bug in dash 0.5.6
  t5512 (ls-remote): modernize style
  tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
 2012-03-04 22:21:52 -08:00
Junio C Hamano
ead8eb8c10 Update draft release notes to 1.7.9.3 for the last time 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-04 22:21:30 -08:00
Junio C Hamano
222433ee4b Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-03-02 11:49:41 -08:00
Junio C Hamano
66b8800e53 Merge branch 'rs/no-no-no-parseopt' 
* rs/no-no-no-parseopt:
  parse-options: remove PARSE_OPT_NEGHELP
  parse-options: allow positivation of options starting, with no-
  test-parse-options: convert to OPT_BOOL()

Conflicts:
	builtin/grep.c
 2012-03-01 20:59:31 -08:00
Junio C Hamano
f051ad6d11 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-28 13:31:05 -08:00
Junio C Hamano
25a7850a10 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.9.3
  CodingGuidelines: do not use 'which' in shell scripts
  CodingGuidelines: Add a note about spaces after redirection
  post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly
  post-receive-email: remove unused variable
 2012-02-27 15:37:02 -08:00
Junio C Hamano
b0fa280751 Update draft release notes to 1.7.9.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-27 15:36:08 -08:00
Junio C Hamano
3724cc7c58 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-26 23:11:10 -08:00
Junio C Hamano
8080906245 Merge branch 'maint' 
* maint:
  Document accumulated fixes since 1.7.9.2
  Git 1.7.8.5
  grep -P: Fix matching ^ and $
  am: don't infloop for an empty input file
  rebase -m: only call "notes copy" when rewritten exists and is non-empty
  git-p4: remove bash-ism in t9800
  git-p4: remove bash-ism in t9809
  git-p4: fix submit regression with clientSpec and subdir clone
  git-p4: set useClientSpec variable on initial clone
  Makefile: add thread-utils.h to LIB_H

Conflicts:
	RelNotes
	t/t9809-git-p4-client-view.sh
 2012-02-26 17:39:04 -08:00
Junio C Hamano
62ed0728fe Document accumulated fixes since 1.7.9.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-26 17:08:59 -08:00
Junio C Hamano
4d06691eec Sync with 1.7.8.5 2012-02-26 16:42:35 -08:00
Junio C Hamano
c524ceb12f Git 1.7.8.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-26 16:40:20 -08:00
Junio C Hamano
ba998d33e2 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-23 13:38:50 -08:00
Junio C Hamano
bd444cadb5 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-21 15:29:29 -08:00
Junio C Hamano
887c409a7a Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.9.2
  completion: Allow dash as the first character for __git_ps1
 2012-02-21 15:18:00 -08:00
Junio C Hamano
72d5e74e99 Update draft release notes to 1.7.9.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-21 15:16:34 -08:00
Junio C Hamano
b3a769dc35 Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-20 00:29:40 -08:00
Junio C Hamano
2c8fb23ac7 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.9.2
  gitweb: Fix 'grep' search for multiple matches in file
 2012-02-20 00:14:17 -08:00
Junio C Hamano
233054d114 Update draft release notes to 1.7.9.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-20 00:14:00 -08:00
Junio C Hamano
b0d66b5110 Sync with maint 2012-02-16 14:27:20 -08:00
Junio C Hamano
d1ba7a4cb7 Update draft release notes to 1.7.9.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-16 14:26:32 -08:00
Junio C Hamano
5f90b6fa0f Sync with 1.7.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-14 09:56:23 -08:00
Junio C Hamano
90020e3bcd Git 1.7.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-14 09:53:38 -08:00
Junio C Hamano
6f5e880c68 Sync with maint 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-13 11:48:00 -08:00
Junio C Hamano
58d4203aa6 Update draft release notes to 1.7.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-13 11:46:47 -08:00
Junio C Hamano
624d3519c9 Update draft release notes to 1.7.10 
Again this round mostly consists of fixes for 1.7.9 in preparation for
merging these topics down to maint for 1.7.9.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-12 22:58:36 -08:00
Junio C Hamano
b6b3b6a01f Update draft release notes to 1.7.10 
Document bunch of bugfix topics to be merged down to 'maint' soonish
for 1.7.9.1 maintenance release.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-10 14:16:32 -08:00
Junio C Hamano
1e9d3e3663 Sync with maint 2012-02-10 14:07:00 -08:00
Junio C Hamano
bf5cf766af Update draft release notes to 1.7.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-10 14:04:20 -08:00
Junio C Hamano
12766861cd Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-07 13:01:56 -08:00
Junio C Hamano
65da088244 Sync with maint 2012-02-06 00:04:47 -08:00
Junio C Hamano
2d1abfa8ee Prepare for 1.7.9.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-06 00:03:18 -08:00
Junio C Hamano
f3fb07509c Update draft release notes to 1.7.10 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-02-01 15:26:53 -08:00
Junio C Hamano
85da4d459b Kick off the post 1.7.9 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-29 13:46:18 -08:00
Jeff King
733137496a docs: minor grammar fixes for v1.7.9 release notes 
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-26 11:09:08 -08:00
Michael Haggerty
69204d0ab1 Fix typo in 1.7.9 release notes 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-23 10:11:13 -08:00
Junio C Hamano
bddcefc638 Git 1.7.9-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-18 15:53:35 -08:00
Junio C Hamano
6e06367ab0 Merge branch 'maint' 
* maint:
  Git 1.7.8.4
  Git 1.7.7.6
  diff-index: enable recursive pathspec matching in unpack_trees

Conflicts:
	GIT-VERSION-GEN
 2012-01-18 15:52:08 -08:00
Junio C Hamano
c572f491e5 Git 1.7.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-18 15:51:00 -08:00
Junio C Hamano
d899cf559b Merge branch 'maint-1.7.7' into maint 
* maint-1.7.7:
  Git 1.7.7.6
  diff-index: enable recursive pathspec matching in unpack_trees

Conflicts:
	GIT-VERSION-GEN
 2012-01-18 15:48:46 -08:00
Junio C Hamano
0065343548 Git 1.7.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-18 15:46:31 -08:00
Junio C Hamano
6db5c6e43d Git 1.7.9-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-12 23:43:28 -08:00
Junio C Hamano
c4a01a3cbb Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.8.4
  Update draft release notes to 1.7.7.6
  Update draft release notes to 1.7.6.6
  thin-pack: try harder to use preferred base objects as base
 2012-01-12 23:33:39 -08:00
Junio C Hamano
ab8a78084b Update draft release notes to 1.7.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-12 23:33:29 -08:00
Junio C Hamano
5a6a939481 Merge branch 'maint-1.7.7' into maint 
* maint-1.7.7:
  Update draft release notes to 1.7.7.6
  Update draft release notes to 1.7.6.6
  thin-pack: try harder to use preferred base objects as base
 2012-01-12 23:31:46 -08:00
Junio C Hamano
8f83acf77c Update draft release notes to 1.7.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-12 23:31:41 -08:00
Junio C Hamano
901c907d83 Merge branch 'maint-1.7.6' into maint-1.7.7 
* maint-1.7.6:
  Update draft release notes to 1.7.6.6
  thin-pack: try harder to use preferred base objects as base
 2012-01-12 23:31:05 -08:00
Junio C Hamano
04f6785a08 Update draft release notes to 1.7.6.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-12 23:30:53 -08:00
Junio C Hamano
e04dc492ac Sync with maint 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:46:22 -08:00
Junio C Hamano
be4d2920c2 Prepare for 1.7.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:27:14 -08:00
Junio C Hamano
55dcc2ebad Merge the attributes fix in from maint-1.6.7 branch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:24:01 -08:00
Junio C Hamano
804e97fc77 Prepare for 1.7.7.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:16:49 -08:00
Junio C Hamano
6c65b5ea43 Merge the attributes fix in from maint-1.6.6 branch 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 14:14:26 -08:00
Junio C Hamano
f14f9803ef Prepare for 1.7.6.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-10 13:11:03 -08:00
Junio C Hamano
eac2d83247 Git 1.7.9-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-06 12:51:09 -08:00
Junio C Hamano
5de89d3abf Merge branch 'jc/show-sig' 
* jc/show-sig:
  log --show-signature: reword the common two-head merge case
  log-tree: show mergetag in log --show-signature output
  log-tree.c: small refactor in show_signature()
  commit --amend -S: strip existing gpgsig headers
  verify_signed_buffer: fix stale comment
  gpg-interface: allow use of a custom GPG binary
  pretty: %G[?GS] placeholders
  test "commit -S" and "log --show-signature"
  log: --show-signature
  commit: teach --gpg-sign option

Conflicts:
	builtin/commit-tree.c
	builtin/commit.c
	builtin/merge.c
	notes-cache.c
	pretty.c
 2012-01-06 12:44:07 -08:00
Junio C Hamano
21c6a18c75 Sync with 1.7.8.3 2012-01-06 12:42:48 -08:00
Junio C Hamano
5f4d133fca Git 1.7.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2012-01-06 12:41:39 -08:00
Junio C Hamano
17b4e93d5b Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-28 12:07:22 -08:00
Junio C Hamano
48de6569eb Sync with 1.7.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-28 12:04:25 -08:00
Junio C Hamano
f3f778df69 Git 1.7.8.2 
Contains accumulated fixes since 1.7.8 that have been merged to the
'master' branch in preparation for the 1.7.9 release.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-28 12:03:24 -08:00
Junio C Hamano
ec330158ec Update draft release notes in preparation for 1.7.9-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-22 15:36:48 -08:00