merge-recursive.c: Add more generic merge_recursive_generic()
Stephan Beyer committed over 18 years ago
Split out merge_recursive() to merge-recursive.c
Miklos Vajna committed over 18 years ago
diff: Help "less" hide ^M from the output
Junio C Hamano committed about 18 years ago
Junio C Hamano committed about 18 years ago
gitattributes: -crlf is not binary
Junio C Hamano committed about 18 years ago
checkout -m: recreate merge when checking out of unmerged index
Junio C Hamano committed about 18 years ago
Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'
Junio C Hamano committed about 18 years ago
git-merge-recursive: learn to honor merge.conflictstyle
Junio C Hamano committed about 18 years ago
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
Junio C Hamano committed about 18 years ago
rerere: understand "diff3 -m" style conflicts with the original
Junio C Hamano committed about 18 years ago
rerere.c: use symbolic constants to keep track of parsing states
Junio C Hamano committed about 18 years ago
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