mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 15:34:51 +01:00
Code Activity
30655 commits 6 branches 956 tags 532 MiB
Commit graph

387 commits

Author SHA1 Message Date
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