Merge branch 'np/relnotes-in-subdir'

Junio C Hamano committed about 16 years ago

Prepare for 1.7.3 rc1

Junio C Hamano committed about 16 years ago

Merge branch 'maint'

Junio C Hamano committed about 16 years ago

userdiff.c: add builtin fortran regex patterns

Brandon Casey committed about 16 years ago

post-receive-email: ensure sent messages are not empty

Kevin P. Fleming committed about 16 years ago

config.txt: fix placement of diff.noprefix

Mark Lodato committed about 16 years ago

t/t4018: avoid two unnecessary sub-shell invocations

Brandon Casey committed about 16 years ago

read-tree: deprecate syntax without tree-ish args

Jan Krüger committed about 16 years ago

Merge branch 'maint'

Junio C Hamano committed about 16 years ago

t/t4018: test whether the word_regex patterns compile

Brandon Casey committed about 16 years ago

xdiff-interface.c: always trim trailing space from xfuncname matches

Brandon Casey committed about 16 years ago

diff.c: call regfree to free memory allocated by regcomp when necessary

Brandon Casey committed about 16 years ago

t/t5510-fetch.sh: improve testing with explicit URL and merge spec

Brandon Casey committed about 16 years ago

builtin/fetch.c: comment that branch->remote_name is usable when has_merge

Brandon Casey committed about 16 years ago

Makefile: use compat regex on IRIX 6.5

Brandon Casey committed about 16 years ago

t/t7008: workaround broken handling of \000 by printf on IRIX

Brandon Casey committed about 16 years ago

Add --src/dst-prefix to git-formt-patch in git-rebase.sh

Oded Shimon committed about 16 years ago

merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

Elijah Newren committed about 16 years ago

t3509: Add rename + D/F conflict testcase that recursive strategy fails

Elijah Newren committed about 16 years ago

install-webdoc: keep installed RelNotes-*.txt

Junio C Hamano committed about 16 years ago