merge-recursive: Fix multiple file rename across D/F conflict

Elijah Newren committed about 16 years ago

t6031: Add a testcase covering multiple renames across a D/F conflict

Elijah Newren committed about 16 years ago

merge-recursive: Fix typo

Elijah Newren committed about 16 years ago

Merge branch 'tc/checkout-B'

Junio C Hamano committed about 16 years ago

mergetool: Skip autoresolved paths

David Aguilar committed about 16 years ago

hash binary sha1 into patch id

Clemens Buchacher committed about 16 years ago

Userdiff patterns for C#

Petr Onderka committed about 16 years ago

t7006 (pager): add missing TTY prerequisites

Jonathan Nieder committed about 16 years ago

merge: let custom strategies intervene in trivial merges

Jonathan Nieder committed about 16 years ago

t7606 (merge-theirs): modernize style

Jonathan Nieder committed about 16 years ago

merge-file: run setup_git_directory_gently() sooner

Nguyễn Thái Ngọc Duy committed over 16 years ago

var: run setup_git_directory_gently() sooner

Nguyễn Thái Ngọc Duy committed over 16 years ago

ls-remote: run setup_git_directory_gently() sooner

Nguyễn Thái Ngọc Duy committed over 16 years ago

index-pack: run setup_git_directory_gently() sooner

Nguyễn Thái Ngọc Duy committed over 16 years ago

Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix

Junio C Hamano committed about 16 years ago

config: run setup_git_directory_gently() sooner

Nguyễn Thái Ngọc Duy committed over 16 years ago

bundle: run setup_git_directory_gently() sooner

Nguyễn Thái Ngọc Duy committed over 16 years ago

apply: run setup_git_directory_gently() sooner

Nguyễn Thái Ngọc Duy committed about 16 years ago

log: test for regression introduced in v1.7.2-rc0~103^2~2

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

cherry-pick/revert: Use advise() for hints

Jonathan Nieder committed about 16 years ago