xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
Junio C Hamano committed about 18 years ago
xmerge.c: minimum readability fixups
Junio C Hamano committed about 18 years ago
xdiff-merge: optionally show conflicts in "diff3 -m" style
Junio C Hamano committed about 18 years ago
xdl_fill_merge_buffer(): separate out a too deeply nested function
Junio C Hamano committed about 18 years ago
checkout --ours/--theirs: allow checking out one side of a conflicting merge
Junio C Hamano committed about 18 years ago
checkout -f: allow ignoring unmerged paths when checking out of the index
Junio C Hamano committed about 18 years ago
checkout: do not check out unmerged higher stages randomly
Junio C Hamano committed about 18 years ago
Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
Junio C Hamano committed about 18 years ago
Start conforming code to "git subcmd" style
Heikki Orsila committed about 18 years ago
git-apply: Loosen "match_beginning" logic
Junio C Hamano committed about 18 years ago
Fix example in git-name-rev documentation
Junio C Hamano committed about 18 years ago
Merge branch 'sp/missing-thin-base' into maint
Junio C Hamano committed about 18 years ago
Junio C Hamano committed about 18 years ago
Merge branch 'af/maint-install-no-handlink' into maint
Junio C Hamano committed about 18 years ago
shell: do not play duplicated definition games to shrink the executable
Junio C Hamano committed about 18 years ago
Fix use of hardlinks in "make install"
Alex Riesen committed about 18 years ago
rev-list: fix --reverse interaction with --parents
Thomas Rast committed about 18 years ago
fixup_pack_header_footer(): use nicely aligned buffer sizes
Nicolas Pitre committed about 18 years ago
index-pack: use fixup_pack_header_footer()'s validation mode
Nicolas Pitre committed about 18 years ago
pack-objects: use fixup_pack_header_footer()'s validation mode
Nicolas Pitre committed about 18 years ago