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

599 commits

Author SHA1 Message Date
Junio C Hamano
fbcda3c0a7 Prepare draft release notes to 1.7.4.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-16 16:47:40 -07:00
Junio C Hamano
a62eafb0aa Update draft release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-15 15:17:54 -07:00
Junio C Hamano
83c3c6222a Update Release Notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-03-09 16:21:16 -08:00
Junio C Hamano
afb0b7933f Start preparing release notes to 1.7.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-02-28 12:28:20 -08:00
Junio C Hamano
9971d6d52c Git 1.7.4.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-02-11 14:39:55 -08:00
Junio C Hamano
7ed863a85a Git 1.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-30 19:02:37 -08:00
Junio C Hamano
630fc7878b Git 1.7.4-rc3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-24 11:00:00 -08:00
Junio C Hamano
adf872e783 Git 1.7.4-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-13 12:14:18 -08:00
Michael J Gruber
3e70e37e72 RelNotes/1.7.4: minor fixes 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-13 11:32:39 -08:00
Junio C Hamano
685e9d9145 Git 1.7.4-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-05 14:57:19 -08:00
Junio C Hamano
8594495cd6 Merge branch 'maint' to sync with 1.7.3.5 2011-01-05 14:50:33 -08:00
Junio C Hamano
6e97ef31ce Git 1.7.3.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-05 14:49:19 -08:00
Ralf Wildenhues
469bfc962d Fix typos in the documentation 
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-01-04 11:23:42 -08:00
Junio C Hamano
01b97a4cb6 Git 1.7.4-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-28 13:53:24 -08:00
Junio C Hamano
2cd900fcf5 Merge branch 'maint' 
* maint:
  Prepare for 1.7.3.5
  Fix false positives in t3404 due to SHELL=/bin/false
  close file on error in read_mmfile()

Conflicts:
	RelNotes
 2010-12-28 13:50:11 -08:00
Junio C Hamano
17367939eb Prepare for 1.7.3.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-28 13:48:54 -08:00
Junio C Hamano
1b9743462d Update draft release notes to 1.7.4 
We are getting closer to -rc0 ;-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-16 21:43:08 -08:00
Junio C Hamano
15368e1836 Sync with 1.7.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 16:27:40 -08:00
Junio C Hamano
fa1c8542cb Git 1.7.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:47:40 -08:00
Junio C Hamano
b91779f17e Git 1.7.2.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:45:36 -08:00
Junio C Hamano
9db41eba42 Git 1.7.1.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:40:40 -08:00
Junio C Hamano
cb198b3b67 Git 1.7.0.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:38:19 -08:00
Junio C Hamano
abf411e28d Git 1.6.6.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:32:57 -08:00
Junio C Hamano
ec82874ad4 Git 1.6.5.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:27:41 -08:00
Junio C Hamano
88fcc52e44 Git 1.6.4.5 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-15 11:19:11 -08:00
Junio C Hamano
e6b71b3289 Merge branch 'maint' 
* maint:
  Prepare for 1.7.3.4
  use persistent memory for rejected paths
  do not overwrite files in leading path
  lstat_cache: optionally return match_len
  add function check_ok_to_remove()
  t7607: add leading-path tests
  t7607: use test-lib functions and check MERGE_HEAD
  Do not link with -lcrypto under NO_OPENSSL

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-14 08:58:09 -08:00
Junio C Hamano
ada6a4117e Prepare for 1.7.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-14 08:55:52 -08:00
Junio C Hamano
0d181cbb8a Merge branch 'jk/asciidoc-update' 
* jk/asciidoc-update:
  docs: default to more modern toolset
 2010-12-12 21:49:51 -08:00
Junio C Hamano
4443091d96 Relnotes: remove items fixed on 'maint' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-10 16:40:00 -08:00
Junio C Hamano
271c2aa6ee Merge branch 'maint' 2010-12-10 16:36:53 -08:00
Junio C Hamano
c6d059bbcc Prepare for 1.7.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-10 16:35:00 -08:00
Junio C Hamano
b281796eeb Merge branch 'maint' to sync with Git 1.7.3.3 
* maint:
  Git 1.7.3.3
  CodingGuidelines: mention whitespace preferences for shell scripts
  Documentation: do not misinterpret pull refspec as bold text

Conflicts:
	Documentation/git-pull.txt
	RelNotes
 2010-12-03 15:23:55 -08:00
Junio C Hamano
6079ec6680 Git 1.7.3.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-03 15:23:01 -08:00
Junio C Hamano
1c2ab43033 Update draft release notes to 1.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 14:33:26 -08:00
Junio C Hamano
2de3c142d3 Merge branch 'maint' 
* maint:
  Git 1.7.0.8
  Documentation: Fix mark-up of lines with more than one tilde

Conflicts:
	GIT-VERSION-GEN
 2010-12-02 14:32:52 -08:00
Junio C Hamano
7e4eb210bd Prepare for 1.7.3.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 14:31:17 -08:00
Junio C Hamano
2850c1a882 Git 1.7.2.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 14:28:01 -08:00
Junio C Hamano
bd01c6de67 Git 1.7.1.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 12:18:49 -08:00
Junio C Hamano
cbcab75c54 Git 1.7.0.8 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-02 12:13:27 -08:00
Jeff King
79c461d5b1 docs: default to more modern toolset 
When the ASCIIDOC8 and ASCIIDOC_NO_ROFF knobs were built,
many people were still on asciidoc 7 and using older
versions of docbook-xsl. These days, even the almost
2-year-old Debian stable needs these knobs turned.

So let's turn them by default. The new knobs ASCIIDOC7 and
ASCIIDOC_ROFF can be used to get the old behavior if people
are on older systems.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-24 15:13:58 -08:00
Junio C Hamano
d313c1cfe4 Update draft release notes to 1.7.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-17 16:43:14 -08:00
Junio C Hamano
d4c4369752 Sync with 1.7.3.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-10-21 17:16:10 -07:00
Junio C Hamano
8a90438506 Git 1.7.3.2 2010-10-21 17:14:32 -07:00
Junio C Hamano
9855b08d35 Start 1.7.4 cycle 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-29 15:26:17 -07:00
Junio C Hamano
92c1e71777 Git 1.7.3.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-29 10:39:53 -07:00
Junio C Hamano
87b50542a0 Git 1.7.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-18 14:55:08 -07:00
Junio C Hamano
7e100effc6 Git 1.7.3 rc2 2010-09-15 12:47:37 -07:00
Junio C Hamano
5b45c55545 Merge branch 'np/relnotes-in-subdir' 
* np/relnotes-in-subdir:
  install-webdoc: keep installed RelNotes-*.txt
  Documentation: move RelNotes into a directory of their own
 2010-09-10 11:54:58 -07:00
Nicolas Pitre
761e742d69 Documentation: move RelNotes into a directory of their own 
There are 108 of them already.  That's a bit more than one third of
all the files in the Documentation directory already, and still growing.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-09-06 17:41:18 -07:00