Commit Briefs

Stefan Sperling

fix merging of files which contain a dot on a line by itself

Annoying bug which we inherited from OpenRCS which inherited it from OpenBSD's diff3 program. ok tracey millert


Stefan Sperling

speed up 'got histedit -l' and 'got rebase -l'

Cache commit timestamps in struct got_reference in case we are sorting references by commit timestamp. This avoids opening and closing commits every time we compare two references with each other. ok thomas.adam



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