delta/git.git, branch v1.7.2.4

Git 1.7.2.4

2010-12-02T22:28:01+00:00

Signed-off-by: Junio C Hamano

Git 1.7.1.3

2010-12-02T20:18:49+00:00

Signed-off-by: Junio C Hamano

Git 1.7.0.8

2010-12-02T20:13:27+00:00

Signed-off-by: Junio C Hamano

Merge branch 'maint-1.7.1' into maint-1.7.2

2010-12-02T00:40:20+00:00

* maint-1.7.1:
  add: introduce add.ignoreerrors synonym for add.ignore-errors

Merge branch 'maint-1.7.0' into maint-1.7.1

2010-12-02T00:37:34+00:00

* maint-1.7.0:
  add: introduce add.ignoreerrors synonym for add.ignore-errors

add: introduce add.ignoreerrors synonym for add.ignore-errors

2010-12-01T21:40:12+00:00

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 
Acked-by: Jeff King 
Signed-off-by: Junio C Hamano

bash: Match lightweight tags in prompt

2010-12-01T19:51:59+00:00

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 
Signed-off-by: Junio C Hamano

git-commit.txt: (synopsis): move -i and -o before "--"

2010-12-01T19:26:43+00:00

All options, including -i and -o, must come before "--" which is the
end of options marker.

Reported-by: Joey Hess 
Signed-off-by: Jari Aalto 
Signed-off-by: Junio C Hamano

t3101: modernise style

2010-09-12T20:46:58+00:00

Also add a few " &&" cascade that were missing.

Signed-off-by: Junio C Hamano

compat/nedmalloc: don't force NDEBUG on the rest of git

2010-09-11T17:23:03+00:00

Define the nedmalloc feature configuration macros for nedmalloc.o, only.
This keeps assert(3) working for the rest of the git source; it was
turned off for nedmalloc users before by defining NDEBUG globally.

Also remove -DUSE_NED_ALLOCATOR as this macro isn't used anywhere.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano