|
e7303626
|
2020-05-14T19:27:44
|
|
add submodule tests
ok semarie
|
|
|
9627c110
|
2020-04-18T18:40:01
|
|
show a summary of conflicts and related problems after updating/merging files
ok millert@
|
|
|
562580bc
|
2020-01-14T13:25:55
|
|
support Git-style "lightweight" tags as arguments for 'got diff'
|
|
|
f69721c3
|
2019-10-21T09:04:57
|
|
show base commit hash and omit filenames in conflict markers
|
|
|
46f68b20
|
2019-10-19T11:06:56
|
|
show file mode differences when diffing trees
|
|
|
d136cfcb
|
2019-10-12T07:33:12
|
|
show original file content in conflict markers
|
|
|
63035f9f
|
2019-10-06T19:24:31
|
|
add -w (ignore whitespace) option to 'got diff'
|
|
|
2a06fe5f
|
2019-08-24T12:58:07
|
|
indicate non-existent paths in 'got status' and make 'got diff' error for them
|
|
|
d24820bf
|
2019-08-11T21:19:14
|
|
add support for tag objects to 'got diff'
|
|
|
8d301dd9
|
2019-05-14T11:35:15
|
|
use cmp -s, instead of cmp, in all command line tests
|
|
|
95adcdca
|
2019-03-27T09:47:18
|
|
add some diff tests
|