Git 1.7.2.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 1.7.1.3
2010-12-02 14:28:01 -08:00 · 2010-12-02 12:18:49 -08:00 · 2010-12-02 12:13:27 -08:00 · 2010-12-01 16:40:20 -08:00 · 2010-12-01 16:37:34 -08:00 · 2010-12-01 13:40:12 -08:00
475 changed files with 9065 additions and 22580 deletions
--- a/.gitignore
+++ b/.gitignore
@ -166,17 +166,12 @@
 /test-dump-cache-tree
 /test-genrandom
 /test-index-version
-/test-line-buffer
 /test-match-trees
-/test-obj-pool
 /test-parse-options
 /test-path-utils
 /test-run-command
 /test-sha1
 /test-sigchain
-/test-string-pool
-/test-svn-fe
-/test-treap
 /common-cmds.h
 *.tar.gz
 *.dsc
@ -186,12 +181,6 @@
 *.[aos]
 *.py[co]
 .depend/
-*.gcda
-*.gcno
-*.gcov
-/coverage-untested-functions
-/cover_db/
-/cover_db_html/
 *+
 /config.mak
 /autom4te.cache
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@ -279,7 +279,7 @@ $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
 XSLT = docbook.xsl
 XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css

-user-manual.html: user-manual.xml $(XSLT)
+user-manual.html: user-manual.xml
 	$(QUIET_XSLTPROC)$(RM) $@+ $@ && \
 	xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
 	mv $@+ $@
--- a/Documentation/RelNotes-1.5.0.1.txt
+++ b/Documentation/RelNotes-1.5.0.1.txt
--- a/Documentation/RelNotes-1.5.0.2.txt
+++ b/Documentation/RelNotes-1.5.0.2.txt
--- a/Documentation/RelNotes-1.5.0.3.txt
+++ b/Documentation/RelNotes-1.5.0.3.txt
--- a/Documentation/RelNotes-1.5.0.4.txt
+++ b/Documentation/RelNotes-1.5.0.4.txt
--- a/Documentation/RelNotes-1.5.0.5.txt
+++ b/Documentation/RelNotes-1.5.0.5.txt
--- a/Documentation/RelNotes-1.5.0.6.txt
+++ b/Documentation/RelNotes-1.5.0.6.txt
--- a/Documentation/RelNotes-1.5.0.7.txt
+++ b/Documentation/RelNotes-1.5.0.7.txt
--- a/Documentation/RelNotes-1.5.0.txt
+++ b/Documentation/RelNotes-1.5.0.txt
--- a/Documentation/RelNotes-1.5.1.1.txt
+++ b/Documentation/RelNotes-1.5.1.1.txt
--- a/Documentation/RelNotes-1.5.1.2.txt
+++ b/Documentation/RelNotes-1.5.1.2.txt
--- a/Documentation/RelNotes-1.5.1.3.txt
+++ b/Documentation/RelNotes-1.5.1.3.txt
--- a/Documentation/RelNotes-1.5.1.4.txt
+++ b/Documentation/RelNotes-1.5.1.4.txt
--- a/Documentation/RelNotes-1.5.1.5.txt
+++ b/Documentation/RelNotes-1.5.1.5.txt
--- a/Documentation/RelNotes-1.5.1.6.txt
+++ b/Documentation/RelNotes-1.5.1.6.txt
--- a/Documentation/RelNotes-1.5.1.txt
+++ b/Documentation/RelNotes-1.5.1.txt
--- a/Documentation/RelNotes-1.5.2.1.txt
+++ b/Documentation/RelNotes-1.5.2.1.txt
--- a/Documentation/RelNotes-1.5.2.2.txt
+++ b/Documentation/RelNotes-1.5.2.2.txt
--- a/Documentation/RelNotes-1.5.2.3.txt
+++ b/Documentation/RelNotes-1.5.2.3.txt
--- a/Documentation/RelNotes-1.5.2.4.txt
+++ b/Documentation/RelNotes-1.5.2.4.txt
--- a/Documentation/RelNotes-1.5.2.5.txt
+++ b/Documentation/RelNotes-1.5.2.5.txt
--- a/Documentation/RelNotes-1.5.2.txt
+++ b/Documentation/RelNotes-1.5.2.txt
--- a/Documentation/RelNotes-1.5.3.1.txt
+++ b/Documentation/RelNotes-1.5.3.1.txt
--- a/Documentation/RelNotes-1.5.3.2.txt
+++ b/Documentation/RelNotes-1.5.3.2.txt
--- a/Documentation/RelNotes-1.5.3.3.txt
+++ b/Documentation/RelNotes-1.5.3.3.txt
--- a/Documentation/RelNotes-1.5.3.4.txt
+++ b/Documentation/RelNotes-1.5.3.4.txt
--- a/Documentation/RelNotes-1.5.3.5.txt
+++ b/Documentation/RelNotes-1.5.3.5.txt
--- a/Documentation/RelNotes-1.5.3.6.txt
+++ b/Documentation/RelNotes-1.5.3.6.txt
--- a/Documentation/RelNotes-1.5.3.7.txt
+++ b/Documentation/RelNotes-1.5.3.7.txt
--- a/Documentation/RelNotes-1.5.3.8.txt
+++ b/Documentation/RelNotes-1.5.3.8.txt
--- a/Documentation/RelNotes-1.5.3.txt
+++ b/Documentation/RelNotes-1.5.3.txt
--- a/Documentation/RelNotes-1.5.4.1.txt
+++ b/Documentation/RelNotes-1.5.4.1.txt
--- a/Documentation/RelNotes-1.5.4.2.txt
+++ b/Documentation/RelNotes-1.5.4.2.txt
--- a/Documentation/RelNotes-1.5.4.3.txt
+++ b/Documentation/RelNotes-1.5.4.3.txt
--- a/Documentation/RelNotes-1.5.4.4.txt
+++ b/Documentation/RelNotes-1.5.4.4.txt
--- a/Documentation/RelNotes-1.5.4.5.txt
+++ b/Documentation/RelNotes-1.5.4.5.txt
--- a/Documentation/RelNotes-1.5.4.6.txt
+++ b/Documentation/RelNotes-1.5.4.6.txt
--- a/Documentation/RelNotes-1.5.4.7.txt
+++ b/Documentation/RelNotes-1.5.4.7.txt
--- a/Documentation/RelNotes-1.5.4.txt
+++ b/Documentation/RelNotes-1.5.4.txt
--- a/Documentation/RelNotes-1.5.5.1.txt
+++ b/Documentation/RelNotes-1.5.5.1.txt
--- a/Documentation/RelNotes-1.5.5.2.txt
+++ b/Documentation/RelNotes-1.5.5.2.txt
--- a/Documentation/RelNotes-1.5.5.3.txt
+++ b/Documentation/RelNotes-1.5.5.3.txt
--- a/Documentation/RelNotes-1.5.5.4.txt
+++ b/Documentation/RelNotes-1.5.5.4.txt
--- a/Documentation/RelNotes-1.5.5.5.txt
+++ b/Documentation/RelNotes-1.5.5.5.txt
--- a/Documentation/RelNotes-1.5.5.6.txt
+++ b/Documentation/RelNotes-1.5.5.6.txt
--- a/Documentation/RelNotes-1.5.5.txt
+++ b/Documentation/RelNotes-1.5.5.txt
--- a/Documentation/RelNotes-1.5.6.1.txt
+++ b/Documentation/RelNotes-1.5.6.1.txt
--- a/Documentation/RelNotes-1.5.6.2.txt
+++ b/Documentation/RelNotes-1.5.6.2.txt
--- a/Documentation/RelNotes-1.5.6.3.txt
+++ b/Documentation/RelNotes-1.5.6.3.txt
--- a/Documentation/RelNotes-1.5.6.4.txt
+++ b/Documentation/RelNotes-1.5.6.4.txt
--- a/Documentation/RelNotes-1.5.6.5.txt
+++ b/Documentation/RelNotes-1.5.6.5.txt
--- a/Documentation/RelNotes-1.5.6.6.txt
+++ b/Documentation/RelNotes-1.5.6.6.txt
--- a/Documentation/RelNotes-1.5.6.txt
+++ b/Documentation/RelNotes-1.5.6.txt
--- a/Documentation/RelNotes-1.6.0.1.txt
+++ b/Documentation/RelNotes-1.6.0.1.txt
--- a/Documentation/RelNotes-1.6.0.2.txt
+++ b/Documentation/RelNotes-1.6.0.2.txt
--- a/Documentation/RelNotes-1.6.0.3.txt
+++ b/Documentation/RelNotes-1.6.0.3.txt
--- a/Documentation/RelNotes-1.6.0.4.txt
+++ b/Documentation/RelNotes-1.6.0.4.txt
--- a/Documentation/RelNotes-1.6.0.5.txt
+++ b/Documentation/RelNotes-1.6.0.5.txt
--- a/Documentation/RelNotes-1.6.0.6.txt
+++ b/Documentation/RelNotes-1.6.0.6.txt
--- a/Documentation/RelNotes-1.6.0.txt
+++ b/Documentation/RelNotes-1.6.0.txt
--- a/Documentation/RelNotes-1.6.1.1.txt
+++ b/Documentation/RelNotes-1.6.1.1.txt
--- a/Documentation/RelNotes-1.6.1.2.txt
+++ b/Documentation/RelNotes-1.6.1.2.txt
--- a/Documentation/RelNotes-1.6.1.3.txt
+++ b/Documentation/RelNotes-1.6.1.3.txt
--- a/Documentation/RelNotes-1.6.1.4.txt
+++ b/Documentation/RelNotes-1.6.1.4.txt
--- a/Documentation/RelNotes-1.6.1.txt
+++ b/Documentation/RelNotes-1.6.1.txt
--- a/Documentation/RelNotes-1.6.2.1.txt
+++ b/Documentation/RelNotes-1.6.2.1.txt
--- a/Documentation/RelNotes-1.6.2.2.txt
+++ b/Documentation/RelNotes-1.6.2.2.txt
--- a/Documentation/RelNotes-1.6.2.3.txt
+++ b/Documentation/RelNotes-1.6.2.3.txt
--- a/Documentation/RelNotes-1.6.2.4.txt
+++ b/Documentation/RelNotes-1.6.2.4.txt
--- a/Documentation/RelNotes-1.6.2.5.txt
+++ b/Documentation/RelNotes-1.6.2.5.txt
--- a/Documentation/RelNotes-1.6.2.txt
+++ b/Documentation/RelNotes-1.6.2.txt
--- a/Documentation/RelNotes-1.6.3.1.txt
+++ b/Documentation/RelNotes-1.6.3.1.txt
--- a/Documentation/RelNotes-1.6.3.2.txt
+++ b/Documentation/RelNotes-1.6.3.2.txt
--- a/Documentation/RelNotes-1.6.3.3.txt
+++ b/Documentation/RelNotes-1.6.3.3.txt
--- a/Documentation/RelNotes-1.6.3.4.txt
+++ b/Documentation/RelNotes-1.6.3.4.txt
--- a/Documentation/RelNotes-1.6.3.txt
+++ b/Documentation/RelNotes-1.6.3.txt
--- a/Documentation/RelNotes-1.6.4.1.txt
+++ b/Documentation/RelNotes-1.6.4.1.txt
--- a/Documentation/RelNotes-1.6.4.2.txt
+++ b/Documentation/RelNotes-1.6.4.2.txt
--- a/Documentation/RelNotes-1.6.4.3.txt
+++ b/Documentation/RelNotes-1.6.4.3.txt
--- a/Documentation/RelNotes-1.6.4.4.txt
+++ b/Documentation/RelNotes-1.6.4.4.txt
--- a/Documentation/RelNotes-1.6.4.txt
+++ b/Documentation/RelNotes-1.6.4.txt
--- a/Documentation/RelNotes-1.6.5.1.txt
+++ b/Documentation/RelNotes-1.6.5.1.txt
--- a/Documentation/RelNotes-1.6.5.2.txt
+++ b/Documentation/RelNotes-1.6.5.2.txt
--- a/Documentation/RelNotes-1.6.5.3.txt
+++ b/Documentation/RelNotes-1.6.5.3.txt
--- a/Documentation/RelNotes-1.6.5.4.txt
+++ b/Documentation/RelNotes-1.6.5.4.txt
--- a/Documentation/RelNotes-1.6.5.5.txt
+++ b/Documentation/RelNotes-1.6.5.5.txt
--- a/Documentation/RelNotes-1.6.5.6.txt
+++ b/Documentation/RelNotes-1.6.5.6.txt
--- a/Documentation/RelNotes-1.6.5.7.txt
+++ b/Documentation/RelNotes-1.6.5.7.txt
--- a/Documentation/RelNotes-1.6.5.8.txt
+++ b/Documentation/RelNotes-1.6.5.8.txt
--- a/Documentation/RelNotes-1.6.5.txt
+++ b/Documentation/RelNotes-1.6.5.txt
--- a/Documentation/RelNotes-1.6.6.1.txt
+++ b/Documentation/RelNotes-1.6.6.1.txt
--- a/Documentation/RelNotes-1.6.6.2.txt
+++ b/Documentation/RelNotes-1.6.6.2.txt
--- a/Documentation/RelNotes-1.6.6.txt
+++ b/Documentation/RelNotes-1.6.6.txt
--- a/Documentation/RelNotes-1.7.0.1.txt
+++ b/Documentation/RelNotes-1.7.0.1.txt
--- a/Documentation/RelNotes-1.7.0.2.txt
+++ b/Documentation/RelNotes-1.7.0.2.txt
--- a/Documentation/RelNotes-1.7.0.3.txt
+++ b/Documentation/RelNotes-1.7.0.3.txt
--- a/Documentation/RelNotes-1.7.0.4.txt
+++ b/Documentation/RelNotes-1.7.0.4.txt
--- a/Documentation/RelNotes-1.7.0.5.txt
+++ b/Documentation/RelNotes-1.7.0.5.txt
--- a/Documentation/RelNotes-1.7.0.6.txt
+++ b/Documentation/RelNotes-1.7.0.6.txt
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
Junio C Hamano	2de132f884	Merge branch 'maint-1.7.1' into maint-1.7.2 * maint-1.7.1: add: introduce add.ignoreerrors synonym for add.ignore-errors	2010-12-01 16:40:20 -08:00
Junio C Hamano	e760924cbe	Merge branch 'maint-1.7.0' into maint-1.7.1 * maint-1.7.0: add: introduce add.ignoreerrors synonym for add.ignore-errors	2010-12-01 16:37:34 -08:00
Jonathan Nieder	6b3020a241	add: introduce add.ignoreerrors synonym for add.ignore-errors The "[add] ignore-errors" tweakable introduced by v1.5.6-rc0~30^2 (Add a config option to ignore errors for git-add, 2008-05-12) does not follow the usual convention for naming values in the git configuration file. What convention? Glad you asked. The section name indicates the affected subsystem. The subsection name, if any, indicates which of an unbound set of things to set the value for. The variable name describes the effect of tweaking this knob. The section and variable names can be broken into words using bumpyCaps in documentation as a hint to the reader. These word breaks are not significant at the level of code, since the section and variable names are not case sensitive. The name "add.ignore-errors" includes a dash, meaning a naive configuration file like [add] ignoreErrors does not have any effect. Avoid such confusion by renaming to the more consistent add.ignoreErrors, but keep the old version for backwards compatibility. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-12-01 13:40:12 -08:00
knittl	bd40d252ec	bash: Match lightweight tags in prompt The bash prompt would display a commit's object name when having checked out a lightweight tag. Provide `--tags` to `git describe` in the completion script, so it will display lightweight tag names, as it already does for annotated tags. Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-12-01 11:51:59 -08:00
Jari Aalto	dc91e1b2cb	git-commit.txt: (synopsis): move -i and -o before "--" All options, including -i and -o, must come before "--" which is the end of options marker. Reported-by: Joey Hess <joey@kitenet.net> Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-12-01 11:26:43 -08:00