Commit Briefs


Stefan Sperling

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

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


Stefan Sperling

display the requested object type when an object could not be found

ok millert@



Stefan Sperling

make got_repo_match_object_id() filter tags by the requested object type

Potentially this function could return objects of a type that was not requested. Problem found by code inspection. This change does not affect any of our existing tests.


Christian Weisgerber

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



Stefan Sperling

add test for merge result when lines are inserted at the top of a file

Based on a patch by Omar Polo



Stefan Sperling

add support for multiple path arguments to 'got diff'

positive feedback from Omar and kn ok kn




Klemens Nanni

Ignore tags files

OK stsp


Klemens Nanni

Provide lib/Makefile to enable tags file generation

The root Makefile does not hook into lib/ via <bsd.subdir.mk> since it is not a program itself and thus gets included by all others. This means `make tags` skips lib/ and `make -C lib/ tags` does not know what to do; provide a minimal <bsd.lib.mk> stub and hook it up just for the "tags" such that *all* source is browsable via tags. See /usr/share/mk/bsd.README for details. Feedback stsp tb OK tb


Stefan Sperling

plug memory leaks in got-fetch-pack and got-send-pack

ok naddy