Commit Briefs

f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

d136cfcb98 Stefan Sperling

show original file content in conflict markers

diff | patch | tree

4c9641fdb6 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

ad7de6a516 Stefan Sperling

remove unused function got_diff_blob_file_lines_changed()

diff | patch | tree

a7c9878d5b Stefan Sperling

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

diff | patch | tree

dc424a06a9 Stefan Sperling

initial 'got stage -p' implementation

diff | patch | tree

7f1f93af75 Stefan Sperling

introduce got_diff_blob_file_lines_changed()

diff | patch | tree

01a4495616 Stefan Sperling

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

57ee5d5084 Stefan Sperling

allow callers of diff3 code to detect merge conflicts

diff | patch | tree

a551f2158d Stefan Sperling

diff3: make labels work and fix leaks

diff | patch | tree

9f98de9c49 Stefan Sperling

declare got_merge_diff3()

diff | patch | tree

acb209ee71 Stefan Sperling

restore support for D_NORMAL diffs of regular files

diff | patch | tree

404c43c4fa Stefan Sperling

basic 'got blame' implementation

diff | patch | tree

e97248b0f4 Stefan Sperling

prune unused declarations from got_lib_diff.h

diff | patch | tree

c48ceb4cb5 Stefan Sperling

remove support for the ifdef diff format from diffreg

diff | patch | tree

1afa8e435b Stefan Sperling

remove REVERSE and NREVERSE diff output options from diffreg

diff | patch | tree

6525c300e6 Stefan Sperling

forgot to delete D_EDIT in previous

diff | patch | tree

119f86008e Stefan Sperling

remove support for "normal" diff output from diffreg

diff | patch | tree

84e118513c Stefan Sperling

remove support for context diffs from diffreg.c

diff | patch | tree

a2a848a2c0 Stefan Sperling

remove ignore-lines pattern support from diffreg code

diff | patch | tree

7673568311 Stefan Sperling

move diffreg's max_context into struct got_diff_state

diff | patch | tree

718b3ab0e3 Stefan Sperling

rename the library-internal headers again to a common prefix

diff | patch | tree