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

896 commits

Author SHA1 Message Date
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
Junio C Hamano
911011aacc Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-07-11 13:25:18 -07:00
Junio C Hamano
56df44a987 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.8.3.3
  git-config: update doc for --get with multiple values
 2013-07-03 15:43:49 -07:00
Junio C Hamano
81a199bb1c Update draft release notes to 1.8.3.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-07-03 15:43:41 -07:00
Junio C Hamano
51f11d69b1 Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-07-01 12:46:41 -07:00
Junio C Hamano
7a3187eb78 Merge branch 'maint' 
* maint:
  Start preparing for 1.8.3.3
  check-ignore doc: fix broken link to ls-files page
  test: spell 'ls-files --delete' option correctly in test descriptions
 2013-06-30 15:45:43 -07:00
Junio C Hamano
c1182d9297 Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-30 15:45:26 -07:00
Junio C Hamano
43d11f4492 Start preparing for 1.8.3.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-30 15:36:03 -07:00
Junio C Hamano
3c36e8a40d Sync with 1.8.3.2 2013-06-28 14:57:09 -07:00
Junio C Hamano
3a461832c5 Git 1.8.3.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-28 14:56:30 -07:00
Junio C Hamano
ebeea52870 Merge branch 'maint' 
* maint:
  Start preparing for 1.8.3.2
 2013-06-27 14:48:54 -07:00
Junio C Hamano
e2652c0bcf Start preparing for 1.8.3.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-27 14:48:14 -07:00
Junio C Hamano
a75f9f053d Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-27 14:32:59 -07:00
Junio C Hamano
85318f521f Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-26 15:10:17 -07:00
Junio C Hamano
9832cb9d4d Update draft release notes to 1.8.4 
For now, comment out the description on two "git status" UI
configuration, until the reverted topic can be resurrected.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-24 13:53:56 -07:00
Junio C Hamano
1f3a412dfa Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-23 14:55:45 -07:00
Junio C Hamano
21ff9151e8 Update draft release notes to 1.8.4 2013-06-20 16:13:41 -07:00
Junio C Hamano
0dbd81251d Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-15 22:12:52 -07:00
Junio C Hamano
879070e650 Update draft release notes 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-11 13:50:12 -07:00
Junio C Hamano
39fd762572 Sync with 1.8.3.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-10 12:35:45 -07:00
Junio C Hamano
362de916c0 Git 1.8.3.1 
Primarily to push out two regression issues that seem to affect many
people, namely, the ".gitignore !directory" bug and "daemon cannot
read from $HOME owned by root" bug.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-10 12:34:42 -07:00
Junio C Hamano
882e78c7f9 Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-06 14:42:56 -07:00
Junio C Hamano
ecb9f3e733 Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-05 15:40:37 -07:00
Junio C Hamano
b2edae0ab6 Update draft release notes to 1.8.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-06-02 16:02:21 -07:00
Junio C Hamano
54219a4d89 Start 1.8.4 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-05-29 15:19:12 -07:00
Junio C Hamano
edca415256 Git 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-05-24 11:34:46 -07:00
Junio C Hamano
ab84621754 Git 1.8.3-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-05-13 11:09:42 -07:00
Junio C Hamano
b387c77b12 Sync with v1.8.2.3 
* maint:
  Git 1.8.2.3
  t5004: avoid using tar for checking emptiness of archive
  t5004: ignore pax global header file
  mergetools/kdiff3: do not use --auto when diffing
  transport-helper: trivial style cleanup
 2013-05-09 13:32:54 -07:00
Junio C Hamano
92758dd2a2 Git 1.8.2.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-05-09 13:31:17 -07:00
Junio C Hamano
9b795193a6 Update draft release notes for 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-05-07 22:50:05 -07:00
Junio C Hamano
de0977d528 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-05-01 15:32:24 -07:00
Marc Branchaud
e7a3c902a6 Fix grammar in the 1.8.3 release notes. 
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-05-01 15:25:24 -07:00
Junio C Hamano
b75cdfaa88 Git 1.8.3-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-26 15:45:09 -07:00
Junio C Hamano
e27004e341 Sync with 1.8.2.2 2013-04-26 13:00:48 -07:00
Junio C Hamano
4a9a4f0ec1 Git 1.8.2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-26 12:59:36 -07:00
Junio C Hamano
2d0b07178d Sync with maint 
* maint:
  Update draft release notes to 1.8.2.2
  completion: remove duplicate block for "git commit -c"
  cherry-pick/revert: make usage say '<commit-ish>...'
 2013-04-24 16:30:04 -07:00
Junio C Hamano
173f9a7145 Update draft release notes to 1.8.2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-24 16:22:07 -07:00
Junio C Hamano
562af5b0b9 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-23 11:27:15 -07:00
Junio C Hamano
118f60ee06 Sync with maint 2013-04-22 11:33:31 -07:00
Junio C Hamano
3e7bb5da9f Start preparing for 1.8.2.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-22 11:32:58 -07:00
Junio C Hamano
3d88f83db2 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-22 11:18:43 -07:00
Junio C Hamano
d2949c7b3c Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-19 13:53:44 -07:00
Junio C Hamano
1468a58393 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-18 12:03:09 -07:00
Junio C Hamano
aec3f77941 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-15 12:45:15 -07:00
Junio C Hamano
7ece7ee607 Update dtaft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-11 17:41:14 -07:00
Junio C Hamano
52a3e011c7 Sync with 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-07 15:28:50 -07:00
Junio C Hamano
5bda18c186 Git 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-07 15:27:23 -07:00
Junio C Hamano
c17b651f19 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-07 14:40:26 -07:00
Junio C Hamano
6466fbbeef Sync with 1.8.1.6 2013-04-07 13:17:50 -07:00
Junio C Hamano
2137ce01f8 Git 1.8.1.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-07 08:58:30 -07:00
Junio C Hamano
21ccebec0d Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-05 14:19:57 -07:00
Junio C Hamano
8d994db46e Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-03 09:44:50 -07:00
Junio C Hamano
260dba5d49 Sync with maint 2013-04-03 09:44:34 -07:00
Junio C Hamano
19534ee8a7 Update draft release notes to 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-03 09:29:14 -07:00
Junio C Hamano
92e0d91632 Sync with 1.8.1 maintenance track 
* maint-1.8.1:
  Start preparing for 1.8.1.6
  git-tag(1): we tag HEAD by default
  Fix revision walk for commits with the same dates
  t2003: work around path mangling issue on Windows
  pack-refs: add fully-peeled trait
  pack-refs: write peeled entry for non-tags
  use parse_object_or_die instead of die("bad object")
  avoid segfaults on parse_object failure
  entry: fix filter lookup
  t2003: modernize style
  name-hash.c: fix endless loop with core.ignorecase=true
 2013-04-03 09:18:01 -07:00
Junio C Hamano
072dda68ea Start preparing for 1.8.1.6 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-03 09:12:11 -07:00
Junio C Hamano
961c5129d5 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-02 15:14:26 -07:00
Junio C Hamano
cc3e4eba72 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-01 09:24:56 -07:00
Junio C Hamano
b442731638 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.8.2.1
 2013-04-01 09:23:30 -07:00
Junio C Hamano
40a0f842da Update draft release notes to 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-04-01 09:23:05 -07:00
Junio C Hamano
8617715cc0 Merge branch 'maint' 
* maint:
  More fixes for 1.8.2.1
  merge-tree: fix typo in merge-tree.c::unresolved
  git-commit doc: describe use of multiple `-m` options
  git-pull doc: fix grammo ("conflicts" is plural)
 2013-03-27 10:58:07 -07:00
Junio C Hamano
9a82efd0d2 More fixes for 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-27 10:57:57 -07:00
Junio C Hamano
2bba2f0e65 More topics from the second batch for 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-26 13:16:11 -07:00
Junio C Hamano
7f95f2dce0 Merge branch 'maint' 
* maint:
  More corrections for 1.8.2.1
  Correct the docs about GIT_SSH.
 2013-03-26 13:14:45 -07:00
Junio C Hamano
3bbbf18d71 More corrections for 1.8.2.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-26 13:14:20 -07:00
Junio C Hamano
7632cd2744 Second wave of topics toward 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-25 14:08:00 -07:00
Junio C Hamano
cd04c522bd Merge branch 'maint' 
* maint:
  Start preparing for 1.8.2.1
  transport.c: help gcc 4.6.3 users by squelching compiler warning
 2013-03-25 13:52:25 -07:00
Junio C Hamano
1252f8b29f Start preparing for 1.8.2.1 
... at the same time, preparation for 1.8.1.6 also has started ;-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-25 13:51:13 -07:00
Junio C Hamano
7b592fadf1 Update draft release notes to 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-21 15:29:42 -07:00
Junio C Hamano
7b9a41987a The first wave of topics for 1.8.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-19 12:30:28 -07:00
Junio C Hamano
048d4d98b3 Start the post 1.8.2 cycle 
Again, tentatively let's call this cycle 1.8.3.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-18 15:01:19 -07:00
Junio C Hamano
3e714cdbab Update draft release notes to 1.8.2 
Split the backward-compatibility notes into two sections, the ones
that affect this release, and the other to describe changes meant
for Git 2.0.  The latter gives a context to understand why the
changes for this release is necessary.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-08 14:14:27 -08:00
Junio C Hamano
4d0d0c3c59 Git 1.8.2-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-03 01:24:11 -08:00
Junio C Hamano
06d67b8766 Sync with 1.8.1.5 2013-03-01 13:17:18 -08:00
Junio C Hamano
e6363a4992 Git 1.8.1.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-03-01 13:15:29 -08:00
Junio C Hamano
443d803e0d Merge branch 'maint' 
* maint:
  Update draft release notes to 1.8.1.5
  Documentation/submodule: Add --force to update synopsis
 2013-02-27 10:10:28 -08:00
Junio C Hamano
8d44277d91 Update draft release notes to 1.8.1.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-27 10:09:59 -08:00
Junio C Hamano
4dac0679fe Git 1.8.2-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-25 09:03:26 -08:00
Junio C Hamano
2a4a26b53d Sync with 'maint' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-25 08:28:06 -08:00
Junio C Hamano
7a0d8db36e Prepare for 1.8.1.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-25 08:26:25 -08:00
Junio C Hamano
b3600c3628 Sync with v1.8.1.4 2013-02-19 21:57:27 -08:00
Junio C Hamano
dff9f8835f Git 1.8.1.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-19 21:54:22 -08:00
Junio C Hamano
ce209d0c72 RelNotes 1.8.2: push-simple will not be in effect in this release 
Also migration path for the default behaviour of "git add -u/-A" run
in a subdirectory is worth mentioning.

Both pointed out by Matthieu Moy.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-18 15:59:33 -08:00
Junio C Hamano
004825d314 Git 1.8.2-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-17 15:35:33 -08:00
Junio C Hamano
7b6e784d70 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-15 12:24:54 -08:00
Junio C Hamano
02339dd529 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-14 10:43:07 -08:00
Junio C Hamano
aa3982890f Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-10 20:47:28 -08:00
Junio C Hamano
a923c314aa Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-07 15:25:06 -08:00
Junio C Hamano
c86223b272 Sync with 1.8.1.3 2013-02-07 15:21:49 -08:00
Junio C Hamano
f350082525 Git 1.8.1.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-07 15:21:10 -08:00
Junio C Hamano
2f19ada7f8 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-05 16:20:16 -08:00
Junio C Hamano
f51a757faf Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-04 10:44:26 -08:00
Junio C Hamano
4c2c5537c3 Merge branch 'maint' 
* maint:
  Start preparing for 1.8.1.3
 2013-02-04 10:26:11 -08:00
Junio C Hamano
42f50f8d01 Start preparing for 1.8.1.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-04 10:21:10 -08:00
Junio C Hamano
bcd45b4085 Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-02-01 12:52:08 -08:00
Junio C Hamano
08c0e7fd4a Update draft release notes to 1.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2013-01-28 11:19:59 -08:00
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