Commit graph

1969 commits

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