checkout: use --aggressive when running a 3-way merge (-m).
Junio C Hamano committed over 20 years ago
Fix git-pack-objects for 64-bit platforms
Dennis Stosberg committed over 20 years ago
fix diff-delta bad memory access
Nicolas Pitre committed over 20 years ago
Merge branch 'master' into next
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
checkout: use --aggressive when running a 3-way merge (-m).
Junio C Hamano committed over 20 years ago
revert/cherry-pick: use aggressive merge.
Linus Torvalds committed over 20 years ago
Merge branch 'jc/grep' into next
Junio C Hamano committed over 20 years ago
builtin-grep: -F (--fixed-strings)
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
Junio C Hamano committed over 20 years ago
Merge branch 'jc/grep' into next
Junio C Hamano committed over 20 years ago
Merge branch 'ml/cvs' into next
Junio C Hamano committed over 20 years ago