op public repos

Commits

Commit:: 68ed9ba51a07849681a433ff303ae75cf68aa92d
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Feb 10 11:02:52 2019 UTC

preserve executable bit on files during checkout and update

diff | patch | tree

Commit:: e06046c217e4dfa1f080c81fc9b30dd6706e1568
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 14:57:06 2019 UTC

do not forget about regress tests during 'make obj'

diff | patch | tree

Commit:: 276262e805a4e606f787e74bf5435d50955437c4
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 14:27:19 2019 UTC

fix typo in status code name: GOT_STATUS_MODIFIY -> GOT_STATUS_MODIFY

diff | patch | tree

Commit:: 7f838b36bf8c0d39dd81201613e45646c1579ef0
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 14:25:38 2019 UTC

document status codes displayed by 'got update'

diff | patch | tree

Commit:: 6353ad76e488c8d0df631a779571fdeb41fc9c70
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 14:12:00 2019 UTC

make 'got update' merge file edits

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:: 5d731149d3ea6345b1d5f305211e91eee9f038cd
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 12:22:01 2019 UTC

initialize temp_files in got_merge_diff3()

diff | patch | tree

Commit:: abc6a33f6abdb9b7560fe12f4d32a2f7471ed81c
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 12:20:08 2019 UTC

make readin() actually write to its output argument

diff | patch | tree

Commit:: 25d0340b7ef4cde52e87819c9bf54d65fe136a58
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 11:27:42 2019 UTC

get rid of an unused global in diff3 code

diff | patch | tree

Commit:: 5176f942be3e3d8d458985cc7acfb6d320013692
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 11:26:49 2019 UTC

get rid of another global in diff3 code (diff output buffer)

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:: 5a3ad9e051c99696dd2552a566a4fcea06a2f227
From:: Stefan Sperling <stsp@stsp.name>
Date:: Fri Feb 8 11:18:15 2019 UTC

wrap overlong long line and fix NULL-deref in merge_diff3()

diff | patch | tree

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

make diff3_merge() write result to an output file

diff | patch | tree

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

expand stupid argv-style parameters of merge_diff3()

diff | patch | tree