undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,047 Commits 1 Branch 0 Tags 217 MiB
388c7f8a27
Commit Graph

405 Commits

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