Merge branch 'mh/maint-lockfile-overflow' into maint

Junio C Hamano committed over 13 years ago

Merge branch 'jc/maint-diff-core-safecrlf' into maint

Junio C Hamano committed over 13 years ago

cygwin: stop forcing core.filemode=false

Mark Levedahl committed over 13 years ago

Cygwin 1.7 supports mmap

Mark Levedahl committed over 13 years ago

Cygwin 1.7 has thread-safe pread

Mark Levedahl committed over 13 years ago

Cygwin 1.7 needs compat/regex

Mark Levedahl committed over 13 years ago

t9801: git-p4: check ignore files with client spec

Vitor Antunes committed over 13 years ago

contrib: contacts: add documentation

Eric Sunshine committed over 13 years ago

contrib: contacts: add mailmap support

Eric Sunshine committed over 13 years ago

contrib: contacts: interpret committish akin to format-patch

Eric Sunshine committed over 13 years ago

contrib: contacts: add ability to parse from committish

Eric Sunshine committed over 13 years ago

contrib: add git-contacts helper

Eric Sunshine committed over 13 years ago

Revert "compat/unsetenv.c: Fix a sparse warning"

Benoit Sigoure committed over 13 years ago

t2202: make sure "git add" (no args) stays a no-op

Junio C Hamano committed over 13 years ago

traverse_trees(): clarify return value of the callback

Stefan Beller committed over 13 years ago

diff: remove "diff-files -q" in a version of Git in a distant future

Junio C Hamano committed over 13 years ago

diff: deprecate -q option to diff-files

Junio C Hamano committed over 13 years ago

git add -e: Explicitly specify that patch should have no color

Andrew Wong committed over 13 years ago

Sync with maint

Junio C Hamano committed over 13 years ago

Start preparing for 1.8.3.4

Junio C Hamano committed over 13 years ago