4 years ago Stefan Sperling
show base commit hash and omit filenames in conflict markers
show file mode differences when diffing trees
handle xbit-only changes during 'got update'
teach 'got commit' to tweak the executable bit of a file
fix a tog log view performance bug when lots of commits are loaded
set the executable bit on integrate.sh
add a 'got integrate' example to the man page
catch and reject integration into the freshly rebased branch
add 'got integrate' command
fix interlocking between tog log and man threads during search
show original file content in conflict markers
properly handle read errors in got_packidx_init_hdr (found by jj@ scan-build)
prevent a NULL deref in an error path of got.c's diff_trees()
improve use of mixed size_t/off_t types in diff3.c's edscript()
diff3.c: do not use the same variables for both line numbers and byte offsets