|
f69721c3
|
2019-10-21T09:04:57
|
|
show base commit hash and omit filenames in conflict markers
|
|
|
d136cfcb
|
2019-10-12T07:33:12
|
|
show original file content in conflict markers
|
|
|
4c9641fd
|
2019-08-21T16:57:44
|
|
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.
|
|
|
ad7de6a5
|
2019-08-08T09:27:38
|
|
remove unused function got_diff_blob_file_lines_changed()
|
|
|
a7c9878d
|
2019-08-08T08:40:38
|
|
make stage -p show the number of changes in a file
|
|
|
dc424a06
|
2019-08-07T17:26:35
|
|
initial 'got stage -p' implementation
|
|
|
7f1f93af
|
2019-08-06T17:24:17
|
|
introduce got_diff_blob_file_lines_changed()
|
|
|
01a44956
|
2019-03-27T08:36:44
|
|
declare conflict marker strings in got_lib_diff.h
|
|
|
57ee5d50
|
2019-02-08T15:10:49
|
|
allow callers of diff3 code to detect merge conflicts
|
|
|
a551f215
|
2019-02-08T14:58:30
|
|
diff3: make labels work and fix leaks
|
|
|
acb209ee
|
2019-02-07T13:59:17
|
|
restore support for D_NORMAL diffs of regular files
|
|
|
9f98de9c
|
2019-02-08T12:09:28
|
|
declare got_merge_diff3()
|
|
|
404c43c4
|
2018-06-21T23:22:57
|
|
basic 'got blame' implementation
|
|
|
e97248b0
|
2018-04-02T21:01:27
|
|
prune unused declarations from got_lib_diff.h
|
|
|
c48ceb4c
|
2018-04-02T20:58:50
|
|
remove support for the ifdef diff format from diffreg
|
|
|
1afa8e43
|
2018-04-02T20:54:51
|
|
remove REVERSE and NREVERSE diff output options from diffreg
|
|
|
6525c300
|
2018-04-02T20:51:57
|
|
forgot to delete D_EDIT in previous
|
|
|
119f8600
|
2018-04-02T20:49:11
|
|
remove support for "normal" diff output from diffreg
|
|
|
84e11851
|
2018-04-02T20:47:21
|
|
remove support for context diffs from diffreg.c
|
|
|
a2a848a2
|
2018-04-02T20:43:42
|
|
remove ignore-lines pattern support from diffreg code
|
|
|
76735683
|
2018-04-02T16:37:53
|
|
move diffreg's max_context into struct got_diff_state
|
|
|
718b3ab0
|
2018-03-17T17:50:48
|
|
rename the library-internal headers again to a common prefix
|