Commit Briefs

8b692cd00b Stefan Sperling

remove lock files, as intended, when reintegrate gets aborted

diff | patch | tree

f69721c3fc Stefan Sperling

show base commit hash and omit filenames in conflict markers

diff | patch | tree

46f68b205b Stefan Sperling

show file mode differences when diffing trees

diff | patch | tree

523b8417c1 Stefan Sperling

handle xbit-only changes during 'got update'

diff | patch | tree

1ebedb77e0 Stefan Sperling

teach 'got commit' to tweak the executable bit of a file

diff | patch | tree

7ca04879e2 Stefan Sperling

fix a tog log view performance bug when lots of commits are loaded

diff | patch | tree

73529b9f61 Stefan Sperling

set the executable bit on integrate.sh

diff | patch | tree

14c25ea21a Stefan Sperling

add a 'got integrate' example to the man page

diff | patch | tree

3aef623b22 Stefan Sperling

catch and reject integration into the freshly rebased branch

diff | patch | tree

2822a3526b Stefan Sperling

add 'got integrate' command

diff | patch | tree

13add98862 Stefan Sperling

fix interlocking between tog log and man threads during search

diff | patch | tree

d136cfcb98 Stefan Sperling

show original file content in conflict markers

diff | patch | tree

c6368c2e90 Stefan Sperling

properly handle read errors in got_packidx_init_hdr (found by jj@ scan-build)

diff | patch | tree

366e0a5f18 Stefan Sperling

prevent a NULL deref in an error path of got.c's diff_trees()

diff | patch | tree

d59c0cb27b Stefan Sperling

improve use of mixed size_t/off_t types in diff3.c's edscript()

diff | patch | tree

b2338effff Stefan Sperling

diff3.c: do not use the same variables for both line numbers and byte offsets

diff | patch | tree

887758148e Stefan Sperling

diff3.c's skip() returns number of bytes skipped so switch from int to size_t

diff | patch | tree

11594751a6 Stefan Sperling

sync distfile list

diff | patch | tree

96cbb59708 Stefan Sperling

remove worklist code; it was only used to unlink files which we already unlink

diff | patch | tree

68bda3b1b9 Stefan Sperling

diff3.c: check for unlink errors and unlink dp13 and dp23 again

diff | patch | tree

9688d20ad6 Stefan Sperling

rename local variable in diff3.c's edscript() from j to len (not a loop index)

diff | patch | tree

9d4a5e899d Stefan Sperling

rename local variable in diff3.c's skip() from j to len (not a loop index)

diff | patch | tree

db33008019 Stefan Sperling

remove pointless attempt of unlinking temporary file name template paths

diff | patch | tree

e45311301f Stefan Sperling

do not leak open file in diff3.c's readin() error paths

diff | patch | tree

971405a7e4 Stefan Sperling

do not abuse d3s->fp[0] as a local variable in diff3.c's readin()

diff | patch | tree