op public repos

Commits

Commit:: f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Oct 21 09:04:57 2019 UTC

show base commit hash and omit filenames in conflict markers

Commit:: d136cfcb987bd2fd865f8711449dc47b7f63455f
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Oct 12 07:33:12 2019 UTC

show original file content in conflict markers

Commit:: 4c9641fdb639da1d7ad1bde82b3010e5ac1e096f
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Aug 21 21:49:33 2019 UTC

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

Commit:: ad7de6a5165442ec89b9daaadb18901a981befee
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Aug 8 07:27:38 2019 UTC

remove unused function got_diff_blob_file_lines_changed()

diff | patch | tree

Commit:: a7c9878d5b0e7770339e76efc0821897fe7a6be8
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Aug 8 06:40:38 2019 UTC

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

diff | patch | tree

Commit:: dc424a06a9c1f0f664cee320cc1b34752f33ec97
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Aug 7 15:26:35 2019 UTC

initial 'got stage -p' implementation

diff | patch | tree

Commit:: 7f1f93af7593347c6efde1bc79997fbff2b64ef2
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Aug 6 15:24:17 2019 UTC

introduce got_diff_blob_file_lines_changed()

diff | patch | tree

Commit:: 01a44956166c76e44f58809e5a1ea1477adfef80
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 07:36:44 2019 UTC

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

Commit:: 57ee5d5084c5c07c321352b7412a51d2f89ef298
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 14:10:49 2019 UTC

allow callers of diff3 code to detect merge conflicts

diff | patch | tree

Commit:: a551f2158d980464de9ecc41bab55ff7143103d7
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 13:58:30 2019 UTC

diff3: make labels work and fix leaks

diff | patch | tree

Commit:: 9f98de9c4993b8b5ae95cedf9b1d916f6618a887
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 11:18:15 2019 UTC

declare got_merge_diff3()

diff | patch | tree

Commit:: acb209ee710a07170e5cf7fe8103dbab0666549b
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 11:18:15 2019 UTC

restore support for D_NORMAL diffs of regular files

diff | patch | tree

Commit:: 404c43c4fa13923747c649f395f5b2bcb9fcd484
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Jun 21 21:22:57 2018 UTC

basic 'got blame' implementation

diff | patch | tree

Commit:: e97248b0f4809130bbab608a1fe9992702b77e38
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Apr 2 19:01:27 2018 UTC

prune unused declarations from got_lib_diff.h

diff | patch | tree

Commit:: c48ceb4cb5c011dd474de08159b58efa8cb3c76e
From:: Stefan Sperling <stsp@stsp.name>
Date:: Mon Apr 2 18:58:50 2018 UTC

remove support for the ifdef diff format from diffreg

diff | patch | tree

More ↓