|
64453f7e
|
2020-11-21T13:35:00
|
|
handle binary files in got/tog diff commands; add -a options to force text
|
|
fe621944
|
2020-11-10T22:54:37
|
|
merge new diff implementation from the git.gameoftrees.org diff.git repository
This new diff implementation was started by Neels Hofmeyr during the u2k20
hackathon and now replaces diffreg.c code lifted from the OpenBSD base system.
The integration of this code into Got was done by me.
Got now uses the patience diff algorithm by default.
The diff.git repository will remain the primary repository for the diff code,
which already compiles and runs on other operating systems such as Linux.
Any fixes and improvements for files inherited from the diff.git repository
should be written against that repository and synced to got.git afterwards.
|
|
0208f208
|
2020-05-05T09:53:57
|
|
show a list of paths changed in a commit with 'got log -P', and in tog
requested by matthieu@
|
|
46f68b20
|
2019-10-19T11:06:56
|
|
show file mode differences when diffing trees
|
|
63035f9f
|
2019-10-06T19:24:31
|
|
add -w (ignore whitespace) option to 'got diff'
|
|
4ce46740
|
2019-08-08T12:44:18
|
|
label staged blobs with "(staged)" in got diff output
|
|
31b4484f
|
2019-07-27T19:01:01
|
|
speed up rebase and histedit path prefix check: skip blob content diffs
|
|
aaa13589
|
2019-06-01T15:25:13
|
|
generalize got_diff_tree() by adding a diff output callback
|
|
6c34b1aa
|
2019-03-18T17:25:10
|
|
whitespace formatting fixes in include/
|
|
b72f483a
|
2019-02-06T00:04:59
|
|
make 'got diff' show local changes in work tree
|
|
54156555
|
2018-12-24T10:58:32
|
|
undo commit timestamps next to paths in diffs; they are redundant
|
|
adacb96f
|
2018-12-24T10:39:46
|
|
show commit timestamps in diff headers
|
|
15a94983
|
2018-12-23T14:48:47
|
|
remove struct got_object from public library API
|
|
4a8520aa
|
2018-10-18T22:32:17
|
|
use a constant for max diff context size
|
|
df2871d2
|
2018-10-18T11:45:20
|
|
make amount of diff context configurable at API level
|
|
f6861a81
|
2018-09-13T23:48:14
|
|
display file paths in diffs instead of blob SHA1s
|
|
11528a82
|
2018-05-19T16:28:32
|
|
move common diff helpers from got and tog into lib/diff.c
|
|
0c60ce5a
|
2018-04-02T11:10:05
|
|
document the current public API
|
|
74671950
|
2018-02-12T00:15:49
|
|
add output file argument to got_diff_tree
|
|
474b4f94
|
2017-11-30T01:41:44
|
|
add some unimplemented stubs for tree diffing
|
|
62136d3a
|
2017-11-29T23:46:24
|
|
allow for custom diff header labels
|
|
ed9e98a8
|
2017-11-29T22:47:05
|
|
store global diff state in memory provided by caller
|
|
7d283eee
|
2017-11-29T17:11:11
|
|
add and test basic blob diffing functionality
|