Commit Briefs

Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

Stefan Sperling

show original file content in conflict markers

diff | patch | tree

Stefan Sperling

fix and simplify blame algorithm

Always diff against latest version of file. This is much easier since there is no need to keep track of lines shifting around.

diff | patch | tree

Stefan Sperling

remove unused function got_diff_blob_file_lines_changed()

diff | patch | tree

Stefan Sperling

make stage -p show the number of changes in a file

diff | patch | tree

Stefan Sperling

initial 'got stage -p' implementation

diff | patch | tree

Stefan Sperling

introduce got_diff_blob_file_lines_changed()

diff | patch | tree

Stefan Sperling

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

Stefan Sperling

allow callers of diff3 code to detect merge conflicts

diff | patch | tree

Stefan Sperling

diff3: make labels work and fix leaks

diff | patch | tree

Stefan Sperling

declare got_merge_diff3()

diff | patch | tree

Stefan Sperling

restore support for D_NORMAL diffs of regular files

diff | patch | tree

Stefan Sperling

basic 'got blame' implementation

diff | patch | tree

Stefan Sperling

prune unused declarations from got_lib_diff.h

diff | patch | tree

Stefan Sperling

remove support for the ifdef diff format from diffreg

diff | patch | tree