Merge branch 'maint'

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.1' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed over 17 years ago

SubmittingPatches: itemize and reflect upon well written changes

Sam Vilain committed over 17 years ago

Makefile: fix NO_PERL bug with gitweb

Jeff King committed over 17 years ago

t3702: fix reliance on SHELL_PATH being '/bin/sh'

Johannes Schindelin committed over 17 years ago

grep: fix segfault when "git grep '('" is given

Linus Torvalds committed over 17 years ago

t5701: do not get stuck in empty-push/

Johannes Schindelin committed over 17 years ago

NetBSD compilation fix

Patrick Welche committed over 17 years ago

Documentation: fix a grammatical error in api-builtin.txt

Allan Caffee committed over 17 years ago

builtin-merge: fix a typo in an error message

Allan Caffee committed over 17 years ago

Add semicolon to curly brace group in main Makefile

Mark Drago committed over 17 years ago

prune-packed: advanced progress even for non-existing fan-out directories

Johannes Sixt committed over 17 years ago

t4202: fix typo

Linus Torvalds committed over 17 years ago

debug messages are off by default; use -d to enable.

Avery Pennarun committed over 17 years ago

test.sh: oops, never intended to count the raw number of commits.

Avery Pennarun committed over 17 years ago

Simplify merges even more aggressively.

Avery Pennarun committed over 17 years ago

test.sh: make sure no commit changes more than one file at a time.

Avery Pennarun committed over 17 years ago

Only copy a commit if it has at least one nonidentical parent.

Avery Pennarun committed over 17 years ago

Trim some extra merge commits that don't need to go into the split tree.

Avery Pennarun committed over 17 years ago