Merge branch 'maint'

Junio C Hamano committed over 17 years ago

grep: don't support "grep.color"-like config options

Markus Heidelberg committed over 17 years ago

Documentation: fix typos / spelling mistakes

Mike Ralphson committed over 17 years ago

builtin-remote: fix typo in option description

Mike Ralphson committed over 17 years ago

clone: add test for push on an empty clone.

Matthieu Moy committed over 17 years ago

tests: make test-apply-criss-cross-rename more robust

Michał Kiedrowicz committed over 17 years ago

builtin-apply: keep information about files to be deleted

Michał Kiedrowicz committed over 17 years ago

tests: test applying criss-cross rename patch

Michał Kiedrowicz committed over 17 years ago

gitcvs-migration: Link to git-cvsimport documentation

Frank Lichtenheld committed over 17 years ago

Fix off-by-one in read_tree_recursive

Johannes Schindelin committed over 17 years ago

Windows: Skip fstat/lstat optimization in write_entry()

Johannes Sixt committed over 17 years ago

checkout branch: prime cache-tree fully

Junio C Hamano committed over 17 years ago

read-tree -m A B: prime cache-tree from the switched-to tree

Junio C Hamano committed over 17 years ago

Move prime_cache_tree() to cache-tree.c

Junio C Hamano committed over 17 years ago

read-tree A B: do not corrupt cache-tree

Junio C Hamano committed over 17 years ago

Windows: Work around intermittent failures in mingw_rename

Johannes Sixt committed over 17 years ago

gitweb: Fix snapshots requested via PATH_INFO

Holger Weiß committed over 17 years ago

Merge branch 'mm/maint-add-p-quit'

Junio C Hamano committed over 17 years ago

git add -p: add missing "q" to patch prompt

Wincent Colaiuta committed over 17 years ago

Sync with 1.6.2.4

Junio C Hamano committed over 17 years ago