Commit Briefs

Omar Polo

augment patch progress callback with hunks info; recover from errors

Augment got_patch_progress_cb by providing the hunks that were applied with offset (or that failed) and the recoverable error encountered during the operation (bad status, missing file, ...) got_patch now proceeds when a file fails to be patched and exits with GOT_ERR_PATCH_FAILED if no other errors are encountered. While here, also add a test for the 'hunk applied with offset' case and shrink test_patch_dont_apply and illegal_status by taking advantage that 'got patch' doesn't stop at the first error. (And add some other cases to illegal_status too.) discussed with and ok stsp@


Omar Polo

add a dry-run/nop mode for got patch

with lots of help from stsp for the manpage bits!



Stefan Sperling

more 'got patch' man page tweaks


Stefan Sperling

some man page tweaks for 'got patch'

ok op@


Omar Polo

improve `got patch' section of the manpage

Simplify some phrasing, explain what preconditions `got patch' has and what happens to the work tree when an error occurs.



Stefan Sperling

make 'got rm' behave like rm(1) for paths found missing on disk

ok millert@





Klemens Nanni

Fix mandoc HTML rendering for command aliases

Replace hand-rolled parentheses with the proper mdoc(7) macro, otherwise the closing ")" ends up inside the command description. Reported by Josh Rickmar, thanks!



Stefan Sperling

implement 'got diff -c' for diffing commits with optional filtering by path

Need for filtering by path sugggested by kn@ ok naddy@


Christian Weisgerber

document "mg" as alias for the "merge" command


Stefan Sperling

add support for multiple path arguments to 'got diff'

positive feedback from Omar and kn ok kn



Klemens Nanni

Document command aliases in tmux(1) style, add tags for navigation

This has the advantage of tags being located right by the full command; combined with tags ":tco" to search for the `co` alias will jump right to the `checkout` line, neatly showing everything without needing further navigation. tmux hint from Thomas Adam, thanks. OK stsp