mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 10:13:18 +01:00
Code Activity
35794 commits 6 branches 956 tags 504 MiB
Commit graph

595 commits

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