merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency

Nicolas Sebrecht committed over 16 years ago

checkout: accord documentation to what git does

Nicolas Sebrecht committed over 16 years ago

t0005: work around strange $? in ksh when program terminated by a signal

Johannes Sixt committed over 16 years ago

fast-import: Improve robustness when D->F changes provided in wrong order

Elijah Newren committed over 16 years ago

fast-export: Fix output order of D/F changes

Elijah Newren committed over 16 years ago

merge_recursive: Fix renames across paths below D/F conflicts

Elijah Newren committed over 16 years ago

merge-recursive: Fix D/F conflicts

Elijah Newren committed over 16 years ago

Add a rename + D/F conflict testcase

Alexander Gladysh committed over 16 years ago

Add additional testcases for D/F conflicts

Elijah Newren committed over 16 years ago

Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix

Junio C Hamano committed over 16 years ago

diff.c: fix a graph output bug

Bo Yang committed over 16 years ago

tests: Use skip_all=* to skip tests

Ævar Arnfjörð Bjarmason committed over 16 years ago

Fix "read-tree -m A B" priming the cache-tree

Junio C Hamano committed over 16 years ago

Reorganize `git-log' man page to clarify common diff options.

Eli Barzilay committed over 16 years ago

t9118 (git-svn): prevent early failure from taking down later tests

Jonathan Nieder committed over 16 years ago

t9118: avoid PEG revision identifier in tests

Michael J Gruber committed over 16 years ago

grep -O: Do not pass color sequences as filenames to pager

Nazri Ramliy committed over 16 years ago

Git 1.7.2-rc2

Junio C Hamano committed over 16 years ago

Merge branch 'ab/tap'

Junio C Hamano committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago