4 years ago 8b692cd00b Stefan Sperling
remove lock files, as intended, when reintegrate gets aborted
4 years ago f69721c3fc Stefan Sperling
show base commit hash and omit filenames in conflict markers
4 years ago 46f68b205b Stefan Sperling
show file mode differences when diffing trees
4 years ago 523b8417c1 Stefan Sperling
handle xbit-only changes during 'got update'
4 years ago 1ebedb77e0 Stefan Sperling
teach 'got commit' to tweak the executable bit of a file
4 years ago 7ca04879e2 Stefan Sperling
fix a tog log view performance bug when lots of commits are loaded
4 years ago 73529b9f61 Stefan Sperling
set the executable bit on integrate.sh
4 years ago 14c25ea21a Stefan Sperling
add a 'got integrate' example to the man page
4 years ago 3aef623b22 Stefan Sperling
catch and reject integration into the freshly rebased branch
4 years ago 2822a3526b Stefan Sperling
add 'got integrate' command
4 years ago 13add98862 Stefan Sperling
fix interlocking between tog log and man threads during search
4 years ago d136cfcb98 Stefan Sperling
show original file content in conflict markers
4 years ago c6368c2e90 Stefan Sperling
properly handle read errors in got_packidx_init_hdr (found by jj@ scan-build)
4 years ago 366e0a5f18 Stefan Sperling
prevent a NULL deref in an error path of got.c's diff_trees()
4 years ago d59c0cb27b Stefan Sperling
improve use of mixed size_t/off_t types in diff3.c's edscript()
4 years ago b2338effff Stefan Sperling
diff3.c: do not use the same variables for both line numbers and byte offsets
4 years ago 887758148e Stefan Sperling
diff3.c's skip() returns number of bytes skipped so switch from int to size_t
4 years ago 11594751a6 Stefan Sperling
sync distfile list
4 years ago 96cbb59708 Stefan Sperling
remove worklist code; it was only used to unlink files which we already unlink
4 years ago 68bda3b1b9 Stefan Sperling
diff3.c: check for unlink errors and unlink dp13 and dp23 again
4 years ago 9688d20ad6 Stefan Sperling
rename local variable in diff3.c's edscript() from j to len (not a loop index)
4 years ago 9d4a5e899d Stefan Sperling
rename local variable in diff3.c's skip() from j to len (not a loop index)
4 years ago db33008019 Stefan Sperling
remove pointless attempt of unlinking temporary file name template paths
4 years ago e45311301f Stefan Sperling
do not leak open file in diff3.c's readin() error paths
4 years ago 971405a7e4 Stefan Sperling
do not abuse d3s->fp[0] as a local variable in diff3.c's readin()