op public repos

Commits

Commit:: e60e7f5bf0d3d27834b9712529836b42207853c8
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Feb 10 12:03:27 2019 UTC

properly deal with "$?" in cmdline tests; fixes spurious test "ok"

diff | patch | tree

Commit:: 02c0700795c2aee56eaff4d72d82287aa84100ce
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Feb 10 11:46:14 2019 UTC

don't update cached timestamps of already modified files

diff | patch | tree

Commit:: ba8a0d4daae0952f0b83279b0ffc8ab29bcc9c6c
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Feb 10 11:30:06 2019 UTC

clear executable bit when updating files if necessary

diff | patch | tree

Commit:: 2ef81b9be01fe633f5b38dc96c848305b5a895a8
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Feb 10 11:10:40 2019 UTC

skip make obj in cmdline test directory

diff | patch | tree

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