Merge branch 'js/rebase-i-opt'

Junio C Hamano committed over 17 years ago

Merge branch 'fc/parseopt-config'

Junio C Hamano committed over 17 years ago

Remove --kept-pack-only option and associated infrastructure

Brandon Casey committed over 17 years ago

pack-objects: only repack or loosen objects residing in "local" packs

Brandon Casey committed over 17 years ago

git-repack.sh: don't use --kept-pack-only option to pack-objects

Brandon Casey committed over 17 years ago

t7700-repack: add two new tests demonstrating repacking flaws

Brandon Casey committed over 17 years ago

Add a test for checking whether gitattributes is honored by checkout.

Kristian Amlie committed over 17 years ago

Microoptimize strbuf_cmp

Alex Riesen committed over 17 years ago

Produce a nicer output in case of sha1_object_info failures in ls-tree -l

Alex Riesen committed over 17 years ago

Documentation: reword example text in git-bisect.txt.

David J. Mellor committed over 17 years ago

import-tars: separate author from committer

Giuseppe Bilotta committed over 17 years ago

make oneline reflog dates more consistent with multiline format

Jeff King committed over 17 years ago

Merge branch 'js/windows-tests'

Junio C Hamano committed over 17 years ago

t0050: Check whether git init detected symbolic link support correctly

Johannes Sixt committed over 17 years ago

Tests on Windows: $(pwd) must return Windows-style paths

Johannes Sixt committed over 17 years ago

test-lib: Work around missing sum on Windows

Johannes Sixt committed over 17 years ago

test-lib: Work around incompatible sort and find on Windows

Johannes Sixt committed over 17 years ago

t5602: Work around path mangling on MSYS

Johannes Sixt committed over 17 years ago

t5300, t5302, t5303: Do not use /dev/zero

Johannes Sixt committed almost 18 years ago

t2200, t7004: Avoid glob pattern that also matches files

Johannes Sixt committed almost 18 years ago