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
Junio C Hamano
82edd39663
Update draft release notes to 2.0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-03 13:40:59 -07:00
Junio C Hamano
5defdf12cc
Merge branch 'maint'
...
* maint:
Start preparing for 1.9.1
2014-04-03 13:40:31 -07:00
Junio C Hamano
2f91649a9b
Start preparing for 1.9.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-04-03 13:40:00 -07:00
Junio C Hamano
6b869a1eeb
Revert part of 384364b
(Start preparing for Git 2.0, 2014-03-07)
...
As we are not shipping with the submodule change, remove the
entry for it.
2014-04-02 14:16:13 -07:00
Junio C Hamano
25d1ac0e59
Update draft release notes to 2.0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-31 16:41:23 -07:00
Junio C Hamano
96e67c86f8
Update draft release notes to 2.0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-28 13:56:29 -07:00
Junio C Hamano
d393d140b5
Update draft release notes to 2.0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-25 12:01:39 -07:00
Junio C Hamano
3f09db07b3
Update draft release notes to 2.0
2014-03-21 13:41:27 -07:00
Junio C Hamano
5172cb3bcb
Sync with 1.9.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-18 14:34:25 -07:00
Junio C Hamano
a35104faa2
Update draft release notes to Git 2.0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-18 14:33:34 -07:00
Junio C Hamano
cee0c2750b
Git 1.9.1
...
The version numbering scheme has changed since Git 1.9 and we
dropped the third dewey-decimal from the traditional numbering
(e.g. both 1.8.4 and 1.8.5 were major feature releases). This
release 1.9.1 is the first maintenance relase for Git 1.9.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-18 14:16:16 -07:00
Junio C Hamano
00eda23228
Update draft release notes to Git 2.0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-14 14:27:26 -07:00
Junio C Hamano
384364b5f1
Start preparing for Git 2.0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-07 15:22:37 -08:00
Junio C Hamano
5f95c9f850
Git 1.9.0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-02-14 11:35:04 -08:00
Michael J Gruber
9c8ce7397b
release notes: typo fixes
...
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-02-14 11:22:56 -08:00
Junio C Hamano
475c52b7ac
Sync with 1.8.5.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-02-13 13:42:26 -08:00
Junio C Hamano
7bbc4e8fdb
Git 1.8.5.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-02-13 13:41:53 -08:00
Junio C Hamano
89ba81dc76
Sync with 1.8.5.4
2014-02-05 14:14:40 -08:00
Junio C Hamano
3330a2c4f6
Git 1.8.5.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-02-05 14:13:23 -08:00
Junio C Hamano
bd3e186d81
Git 1.9-rc1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-01-27 11:01:35 -08:00
Junio C Hamano
79fcbf7e70
Git 1.9-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-01-17 12:30:14 -08:00
Junio C Hamano
14598b9070
Sync with 1.8.5.3
...
* maint:
Git 1.8.5.3
pack-heuristics.txt: mark up the file header properly
2014-01-13 11:39:38 -08:00
Junio C Hamano
864085aaf6
Update draft release notes to 1.9
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-01-13 11:39:09 -08:00
Junio C Hamano
4224916ae9
Git 1.8.5.3
2014-01-13 11:28:26 -08:00
Junio C Hamano
a25014bc4c
Update draft release notes to 1.9
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-01-10 11:25:01 -08:00
Junio C Hamano
7794a680e6
Sync with 1.8.5.2
...
* maint:
Git 1.8.5.2
cmd_repack(): remove redundant local variable "nr_packs"
2013-12-17 14:12:17 -08:00
Junio C Hamano
b10cd577d8
Update draft release notes to 1.9
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-17 14:05:50 -08:00
Junio C Hamano
5512ac5840
Git 1.8.5.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-17 11:42:12 -08:00
Junio C Hamano
d7aced95cd
Update draft release notes to 1.9
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-12 14:24:39 -08:00
Junio C Hamano
077f43447c
Start 1.9 cycle
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-06 11:20:04 -08:00
Junio C Hamano
a155a5f075
Git 1.8.5.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 11:16:56 -08:00
Junio C Hamano
be38bee862
Sync with 1.8.4.5
2013-12-02 15:34:44 -08:00
Junio C Hamano
2f93541d88
Git 1.8.4.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-02 15:33:30 -08:00
Junio C Hamano
039a6d2463
Sync with 1.8.4.4
2013-11-20 11:26:59 -08:00
Junio C Hamano
becb4336cb
Git 1.8.4.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-11-20 11:26:08 -08:00
Marc Branchaud
569fb49fce
RelNotes: spelling & grammar fixes
...
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-11-18 14:35:55 -08:00
Junio C Hamano
0ecd94d7d7
Sync with 1.8.4.3
2013-11-08 12:08:43 -08:00
Junio C Hamano
d7d2c87955
Git 1.8.4.3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-11-08 12:06:19 -08:00
Junio C Hamano
867b1c1bf6
Sync with maint
...
* maint:
Start preparing for 1.8.4.3
gitignore.txt: fix documentation of "**" patterns
2013-11-07 14:41:25 -08:00
Junio C Hamano
486b65a4c3
Start preparing for 1.8.4.3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-11-07 14:39:47 -08:00
Junio C Hamano
f26f72de15
Update draft release notes to 1.8.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-11-04 15:05:08 -08:00
Junio C Hamano
aa2706463f
Update draft release notes to 1.8.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-11-01 08:14:52 -07:00
Junio C Hamano
42817b96b1
Git 1.8.5-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-30 12:17:47 -07:00
Junio C Hamano
0d6cf2471f
Almost -rc0 for 1.8.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-28 10:53:03 -07:00
Junio C Hamano
cfd10568b0
Sync with v1.8.4.2
2013-10-28 10:51:53 -07:00
Junio C Hamano
dcb11cca50
Git 1.8.4.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-28 10:21:29 -07:00
Junio C Hamano
3d092bfc6f
Update draft release notes to 1.8.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 13:37:27 -07:00
Junio C Hamano
ea21efc740
Sync with 'maint'
2013-10-23 13:36:57 -07:00
Junio C Hamano
ca462804c6
Almost 1.8.4.2 ;-)
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-23 13:34:39 -07:00
Junio C Hamano
db9bdfbeb0
Update draft release notes to 1.8.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-18 13:53:52 -07:00
Junio C Hamano
2141c474d0
Update draft release notes to 1.8.5
2013-10-17 15:57:12 -07:00
Junio C Hamano
83f18cdd71
Sync with maint
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-17 15:54:28 -07:00
Junio C Hamano
92ab409055
Start preparing for 1.8.4.2
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-17 15:50:45 -07:00
Junio C Hamano
1d25dd416f
Update draft release notes to 1.8.5
...
List notable topics that graduated during Jonathan's interim
maintainership.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-10-16 12:27:45 -07:00
Matthieu Moy
9cd755b2fc
RelNotes/1.8.5: direct script writers to "git status --porcelain"
...
[jn: with wording tweak from Keshav Kini]
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
2013-09-27 17:05:02 -07:00
Jonathan Nieder
8de8e40caa
Sync with Git 1.8.4.1
2013-09-26 15:36:57 -07:00
Jonathan Nieder
02a110ad43
Git 1.8.4.1
...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
2013-09-26 15:01:41 -07:00
Junio C Hamano
128a96c984
Update draft release notes to 1.8.5 for the fifth batch of topics
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-20 12:42:02 -07:00
Junio C Hamano
eeaee045c8
Merge branch 'maint'
...
* maint:
Start preparing for 1.8.4.1
2013-09-18 12:08:41 -07:00
Junio C Hamano
a0d3f1090d
Start preparing for 1.8.4.1
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-18 12:08:09 -07:00
Junio C Hamano
587e0a164a
Update draft release notes to 1.8.5 for the fourth batch of topics
2013-09-18 11:55:59 -07:00
Junio C Hamano
8d8387116a
Update draft release notes to 1.8.5 for the first half of the fourth batch
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-17 11:43:58 -07:00
Junio C Hamano
89dde7882f
Merge branch 'rh/ishes-doc'
...
We liberally use "committish" and "commit-ish" (and "treeish" and
"tree-ish"); as these are non-words, let's unify these terms to
their dashed form. More importantly, clarify the documentation on
object peeling using these terms.
* rh/ishes-doc:
glossary: fix and clarify the definition of 'ref'
revisions.txt: fix and clarify <rev>^{<type>}
glossary: more precise definition of tree-ish (a.k.a. treeish)
use 'commit-ish' instead of 'committish'
use 'tree-ish' instead of 'treeish'
glossary: define commit-ish (a.k.a. committish)
glossary: mention 'treeish' as an alternative to 'tree-ish'
2013-09-17 11:42:51 -07:00
Junio C Hamano
89b1b47b0a
Update draft release notes to 1.8.5 for the third batch of topics
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-12 14:42:47 -07:00
Junio C Hamano
a194eaddca
Update draft release notes to 1.8.5
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-11 15:05:57 -07:00
Junio C Hamano
bb80ee0997
Update draft release notes to 1.8.5 for the second batch of topics
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-09 14:51:42 -07:00
Richard Hansen
bb8040f9f9
use 'tree-ish' instead of 'treeish'
...
Replace 'treeish' in documentation and comments with 'tree-ish' to
match gitglossary(7).
The only remaining instances of 'treeish' are:
* variable, function, and macro names
* "(also treeish)" in the definition of tree-ish in gitglossary(7)
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-04 15:02:56 -07:00
Junio C Hamano
57e4c1783f
Update draft release notes after merging the first batch of topics
2013-09-04 12:41:05 -07:00
Junio C Hamano
992c38644a
Start the post-1.8.4 cycle
...
It is tentatively called 1.8.5, but it should be an easy matter of
renaming the release-notes file and RelNotes symlink to later call
it 1.9 near the end of the cycle if we wanted to.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-30 10:16:16 -07:00
Junio C Hamano
0d8beaa5b7
Typofix draft release notes to 1.8.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-21 15:30:04 -07:00
Junio C Hamano
4d06473928
Git 1.8.4-rc4
...
As we had to revert two topics at the last minute, let's have
another (hopefully short) round of rc to make sure the final release
will be sound.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-19 10:34:14 -07:00
Junio C Hamano
64948ad775
Git 1.8.4-rc2
...
This is with mostly minor documentation and test updates, nothing
spectacular except for removal of funky lstat(2) emulation on Cygwin.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-08 14:03:21 -07:00
Junio C Hamano
c490a60790
Git 1.8.4-rc0
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-24 19:29:07 -07:00
Ondřej Bílka
1114fc0237
typofix: release notes
...
Signed-off-by: Ondřej Bílka <neleai@seznam.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-22 16:06:48 -07:00
Junio C Hamano
9c559d5b86
Update draft release notes to 1.8.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-22 11:34:10 -07:00
Junio C Hamano
805c5a5789
Sync with maint
...
* maint:
Update draft release notes to 1.8.3.4
t9801: git-p4: check ignore files with client spec
2013-07-21 23:03:46 -07:00
Junio C Hamano
31fe4057b1
Update draft release notes to 1.8.3.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-21 23:03:19 -07:00
Junio C Hamano
e3d4493031
Sync with maint
2013-07-19 11:15:48 -07:00
Junio C Hamano
f893b7420c
Start preparing for 1.8.3.4
...
Hopefully this will be the final maintenance release before we go to
feature freeze for 1.8.4.
2013-07-19 11:15:17 -07:00
Junio C Hamano
b72c6161f1
Update draft release notes to 1.8.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-18 13:00:08 -07:00
Junio C Hamano
9c3c367b26
Update draft release notes to 1.8.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-15 10:45:33 -07:00
Junio C Hamano
dbc96a77a4
Sync with 1.8.3.3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-15 10:45:02 -07:00
Junio C Hamano
5addd1c753
Git 1.8.3.3
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-15 10:39:43 -07:00
Junio C Hamano
0da7a53a76
Update draft release notes for 1.8.4
...
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-12 12:04:44 -07:00