mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 05:33:04 +01:00
Code Activity
40154 commits 6 branches 956 tags 518 MiB
Commit graph

757 commits

Author SHA1 Message Date
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
Junio C Hamano
e80e85a52a Post 2.3 cycle (batch #11) 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-20 13:53:26 -07:00
Junio C Hamano
9ab698f400 Post 2.3 cyce (batch #10) 
Also declare that the next one will be called v2.4 ;-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-17 16:05:12 -07:00
Junio C Hamano
bb8577532a Git 2.3.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-13 22:57:25 -07:00
Junio C Hamano
1165ae6f3d Git 2.3.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-03-06 14:58:14 -08:00
Junio C Hamano
3ebda3e9f5 Prepare for 2.3.2 2015-03-05 13:15:53 -08:00
Junio C Hamano
8004647a21 Git 2.3.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-02-24 22:14:42 -08:00
Junio C Hamano
9874fca712 Git 2.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-02-05 13:23:56 -08:00
Junio C Hamano
627736ca79 Git 2.3.0-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-20 17:35:41 -08:00
Junio C Hamano
563d4e59bd Fifth batch for 2.3 cycle 
Hopefully this will be the final feature update for 2.3-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-14 12:44:03 -08:00
Junio C Hamano
addfb21a94 Git 2.3.0-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-12 14:12:42 -08:00
Junio C Hamano
def6dd9bc6 Sync with 2.2.2 2015-01-12 14:08:42 -08:00
Junio C Hamano
fdf96a20ac Git 2.2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-12 14:06:12 -08:00
Junio C Hamano
1e6f5b22ad Fourth batch for 2.3 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-07 13:28:37 -08:00
Junio C Hamano
bbcefffcea Sync with maint 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-22 12:43:48 -08:00
Junio C Hamano
2c380e7a8d Third batch for 2.3 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-22 12:43:16 -08:00
Junio C Hamano
c2e8e4b9da Prepare for 2.2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-22 12:20:38 -08:00
Junio C Hamano
3f1509809e Sync with v2.2.1 
* maint:
  Git 2.2.1
  Git 2.1.4
  Git 2.0.5
  Git 1.9.5
  Git 1.8.5.6
  fsck: complain about NTFS ".git" aliases in trees
  read-cache: optionally disallow NTFS .git variants
  path: add is_ntfs_dotgit() helper
  fsck: complain about HFS+ ".git" aliases in trees
  read-cache: optionally disallow HFS+ .git variants
  utf8: add is_hfs_dotgit() helper
  fsck: notice .git case-insensitively
  t1450: refactor ".", "..", and ".git" fsck tests
  verify_dotfile(): reject .git case-insensitively
  read-tree: add tests for confusing paths like ".." and ".git"
  unpack-trees: propagate errors adding entries to the index
 2014-12-18 12:30:53 -08:00
Junio C Hamano
9b7cbb3159 Git 2.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-17 11:49:34 -08:00
Junio C Hamano
77933f4449 Sync with v2.1.4 
* maint-2.1:
  Git 2.1.4
  Git 2.0.5
  Git 1.9.5
  Git 1.8.5.6
  fsck: complain about NTFS ".git" aliases in trees
  read-cache: optionally disallow NTFS .git variants
  path: add is_ntfs_dotgit() helper
  fsck: complain about HFS+ ".git" aliases in trees
  read-cache: optionally disallow HFS+ .git variants
  utf8: add is_hfs_dotgit() helper
  fsck: notice .git case-insensitively
  t1450: refactor ".", "..", and ".git" fsck tests
  verify_dotfile(): reject .git case-insensitively
  read-tree: add tests for confusing paths like ".." and ".git"
  unpack-trees: propagate errors adding entries to the index
 2014-12-17 11:46:57 -08:00
Junio C Hamano
8e36a6d575 Git 2.1.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-17 11:44:59 -08:00
Junio C Hamano
58f1d950e3 Sync with v2.0.5 
* maint-2.0:
  Git 2.0.5
  Git 1.9.5
  Git 1.8.5.6
  fsck: complain about NTFS ".git" aliases in trees
  read-cache: optionally disallow NTFS .git variants
  path: add is_ntfs_dotgit() helper
  fsck: complain about HFS+ ".git" aliases in trees
  read-cache: optionally disallow HFS+ .git variants
  utf8: add is_hfs_dotgit() helper
  fsck: notice .git case-insensitively
  t1450: refactor ".", "..", and ".git" fsck tests
  verify_dotfile(): reject .git case-insensitively
  read-tree: add tests for confusing paths like ".." and ".git"
  unpack-trees: propagate errors adding entries to the index
 2014-12-17 11:42:28 -08:00
Junio C Hamano
9a8c2b67cd Git 2.0.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-17 11:30:46 -08:00
Junio C Hamano
5e519fb8b0 Sync with v1.9.5 
* maint-1.9:
  Git 1.9.5
  Git 1.8.5.6
  fsck: complain about NTFS ".git" aliases in trees
  read-cache: optionally disallow NTFS .git variants
  path: add is_ntfs_dotgit() helper
  fsck: complain about HFS+ ".git" aliases in trees
  read-cache: optionally disallow HFS+ .git variants
  utf8: add is_hfs_dotgit() helper
  fsck: notice .git case-insensitively
  t1450: refactor ".", "..", and ".git" fsck tests
  verify_dotfile(): reject .git case-insensitively
  read-tree: add tests for confusing paths like ".." and ".git"
  unpack-trees: propagate errors adding entries to the index
 2014-12-17 11:28:54 -08:00
Junio C Hamano
83332636f5 Git 1.9.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-17 11:22:32 -08:00
Junio C Hamano
6898b79721 Sync with v1.8.5.6 
* maint-1.8.5:
  Git 1.8.5.6
  fsck: complain about NTFS ".git" aliases in trees
  read-cache: optionally disallow NTFS .git variants
  path: add is_ntfs_dotgit() helper
  fsck: complain about HFS+ ".git" aliases in trees
  read-cache: optionally disallow HFS+ .git variants
  utf8: add is_hfs_dotgit() helper
  fsck: notice .git case-insensitively
  t1450: refactor ".", "..", and ".git" fsck tests
  verify_dotfile(): reject .git case-insensitively
  read-tree: add tests for confusing paths like ".." and ".git"
  unpack-trees: propagate errors adding entries to the index
 2014-12-17 11:20:31 -08:00
Junio C Hamano
5c8213a769 Git 1.8.5.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-17 11:18:45 -08:00
Junio C Hamano
9abc44b681 Second batch for 2.3 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-12 14:37:33 -08:00
Junio C Hamano
c18b867341 First batch for 2.3 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-12-05 12:03:57 -08:00
Marc Branchaud
a2b450d6fd RelNotes: spelling & grammar tweaks 
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-11-26 13:18:04 -08:00
Junio C Hamano
652e759330 Git 2.2.0-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-11-21 12:10:56 -08:00
Junio C Hamano
f5709437d9 Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-11-12 12:13:39 -08:00
Thomas Ackermann
f745acb028 Documentation: typofixes 
In addition to fixing trivial and obvious typos, be careful about
the following points:

 - Spell ASCII, URL and CRC in ALL CAPS;
 - Spell Linux as Capitalized;
 - Do not omit periods in "i.e." and "e.g.".

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-11-04 13:14:44 -08:00
Matthieu Moy
dd83521629 RelNotes/2.2.0.txt: fix minor typos 
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-11-03 11:29:10 -08:00
Junio C Hamano
4ace7ff455 Git 2.2.0-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-10-31 11:57:23 -07:00
Junio C Hamano
36666ce4da Sync with Git 2.1.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-10-29 10:50:17 -07:00
Junio C Hamano
49c3e92634 Git 2.1.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-10-29 10:48:45 -07:00
Junio C Hamano
5b509df0c3 Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-10-29 10:18:31 -07:00
Junio C Hamano
fbecd99861 Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-10-24 15:02:17 -07:00
Junio C Hamano
19b5d50cb1 Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-10-21 13:35:44 -07:00
Junio C Hamano
13da0fc092 Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-10-20 13:07:32 -07:00
Junio C Hamano
670a3c1d5a Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-10-14 10:59:04 -07:00
Junio C Hamano
63a45136a3 Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-10-08 13:08:55 -07:00
Junio C Hamano
565301e416 Sync with 2.1.2 
* maint:
  Git 2.1.2
 2014-09-29 22:17:57 -07:00
Junio C Hamano
80b616d04b Git 2.1.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-09-29 22:15:00 -07:00
Junio C Hamano
0bf7dd652c Update draft release notes to 2.2 2014-09-29 12:44:43 -07:00
Junio C Hamano
d29e9c89db Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-09-26 14:59:32 -07:00
Junio C Hamano
97b8860c07 Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-09-19 14:25:09 -07:00
Junio C Hamano
85e70c31ef Sync with Git 2.1.1 2014-09-19 14:22:43 -07:00
Junio C Hamano
349cb50963 Git 2.1.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-09-19 14:21:31 -07:00
Junio C Hamano
ce1d3a93a6 Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-09-11 11:19:47 -07:00
Junio C Hamano
0c72b98f31 Update draft release notes to 2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-09-09 13:06:26 -07:00
Junio C Hamano
85f083786f Start the post-2.1 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-09-02 13:30:13 -07:00
Marc Branchaud
5261ec5d5d Release notes: grammatical fixes 
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-08-07 09:44:05 -07:00
Junio C Hamano
f54d3c6d7c RelNotes: no more check_ref_format micro-optimization 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-08-05 11:45:09 -07:00
Junio C Hamano
aa544bfbc6 Sync with 2.0.4 
* maint:
  Git 2.0.4
  commit --amend: test specifies authorship but forgets to check
 2014-07-30 14:25:46 -07:00
Junio C Hamano
aa0ba07a02 Update draft release notes to 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-30 14:25:14 -07:00
Junio C Hamano
32f56600bb Git 2.0.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-30 14:19:53 -07:00
Junio C Hamano
49f1cb93a2 Git 2.1.0-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-27 15:22:22 -07:00
Junio C Hamano
996b0fdbb4 Sync with v2.0.3 
* maint:
  Git 2.0.3
  .mailmap: combine Stefan Beller's emails
  git.1: switch homepage for stats
 2014-07-23 11:36:40 -07:00
Junio C Hamano
740c281d21 Git 2.0.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-23 11:33:16 -07:00
Junio C Hamano
0eff86e4f4 Ninth batch for 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-21 12:13:03 -07:00
Junio C Hamano
f2c9f21369 Sync with 2.0.2 
* maint:
  Git 2.0.2
  annotate: use argv_array
 2014-07-16 11:48:16 -07:00
Junio C Hamano
fb46e0c545 Eighth batch for 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-16 11:47:32 -07:00
Junio C Hamano
ebc5da3208 Git 2.0.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-16 11:19:56 -07:00
Junio C Hamano
66f467c3e6 Merge branch 'maint' 
* maint:
  Start preparing for 2.0.2
 2014-07-10 11:37:56 -07:00
Junio C Hamano
da86971c2a Seventh batch for 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-10 11:37:30 -07:00
Junio C Hamano
8693e1cc2f Start preparing for 2.0.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-10 11:15:10 -07:00
Junio C Hamano
81e776d92b Sixth batch for 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-07-09 11:54:17 -07:00
Junio C Hamano
c47372d3a8 Sync with maint 2014-06-25 12:32:58 -07:00
Junio C Hamano
369a70fc77 Fifth batch for 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-06-25 12:32:23 -07:00
Junio C Hamano
341e7e8eda Git 2.0.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-06-25 12:21:11 -07:00
Junio C Hamano
786a89d347 Fourth batch for 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-06-20 13:22:55 -07:00
Junio C Hamano
cb682f8cfe Third batch for 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-06-16 12:39:35 -07:00
Junio C Hamano
50f84e34a1 Update draft release notes to 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-06-09 11:39:43 -07:00
Junio C Hamano
0953113bb5 Second batch for 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-06-06 11:42:05 -07:00
Junio C Hamano
79dcccc503 First batch for 2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-06-03 12:09:13 -07:00
Junio C Hamano
bce14aa132 Sync with 1.9.4 2014-05-30 10:57:52 -07:00
Junio C Hamano
34d5217584 Git 1.9.4 
This is expected to be the final maintenance release for 1.9 series,
merging the remaining fixes that are relevant and are already in 2.0.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-05-30 10:13:41 -07:00
Junio C Hamano
4a28f169ad Update draft release notes to 2.0 
Hopefully for the last time ;-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-05-21 11:50:35 -07:00
Jason St. John
3054c66bd4 RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles 
Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-05-20 14:51:06 -07:00
Junio C Hamano
b2c851a8e6 Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)" 
Instead of showing a warning and working as before, fail and show
the message and force immediate upgrade from their upstream
repositories when these tools are run, per request from their
primary author.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-05-20 14:48:11 -07:00
Junio C Hamano
10e1feebb4 Revert "Merge branch 'fc/transport-helper-sync-error-fix'" 
This reverts commit d508e4a8e2,
reversing changes made to e42552135a.

The author of the original topic says he broke the upcoming 2.0
release with something that relates to "synchronization crash
regression" while refusing to give further specifics, so this would
unfortunately be the safest option for the upcoming release.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-05-19 17:09:57 -07:00
Junio C Hamano
d30acb71ca Sync with maint 
* maint:
  shell doc: remove stray "+" in example
  Start preparing for 1.9.3
 2014-05-08 11:59:51 -07:00
Junio C Hamano
86ae051274 Start preparing for 1.9.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-05-08 10:05:22 -07:00
Junio C Hamano
1dc51c663c Update draft release notes for 2.0 
Describe one last minute one-liner fix for regression introduced in
1.9, and fix a grave mischaracterization on a recent remote-hg/bzr
change, pointed out by Felipe.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-05-07 15:51:17 -07:00
Øyvind A. Holm
1c65d3b9d3 RelNotes/2.0.0: Grammar and typo fixes 
Signed-off-by: Øyvind A. Holm <sunny@sunbase.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-05-06 17:05:34 -07:00
Junio C Hamano
b4f86a4ce8 Git 2.0-rc2 2014-05-02 13:15:52 -07:00
Junio C Hamano
35936f8fc3 Git 2.0-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-04-25 10:03:41 -07:00
Junio C Hamano
779792a5f2 Update draft release notes to 2.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-04-21 11:54:29 -07:00
Junio C Hamano
cc291953df Git 2.0-rc0 
An early-preview for the upcoming Git 2.0.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-04-18 11:21:43 -07:00
Junio C Hamano
3f0c02a1c0 Update draft release notes for 2.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-04-16 13:43:26 -07:00
Junio C Hamano
68773ac915 Sync with 1.9.2 
* maint:
  Git 1.9.2
  doc/http-backend: missing accent grave in literal mark-up
 2014-04-09 12:06:14 -07:00
Junio C Hamano
0bc85abb7a Git 1.9.2 
The second maintenance release for Git 1.9; contains all the fixes
that are scheduled to appear in Git 2.0.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-04-09 12:04:34 -07:00
Junio C Hamano
7bf272cc04 Update draft release notes to 2.0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-04-08 12:11:17 -07:00
Junio C Hamano
2d1a5a5856 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.9.2
 2014-04-08 12:08:59 -07:00
Junio C Hamano
4d7ad08f6a Update draft release notes to 1.9.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-04-08 12:08:34 -07:00