I understand that I can tell etckeeper to not checkin changes before
installing and upgrading packages, but it might be helpful to avoid an
automatic checkin *after* package upgrade somehow, e.g. to handle a
conflict in a config file using git or graphical merge tools. I don't
want to see a broken config file in the git history.

My favorite would be to automatically checkin the original config files
of a package into an "orig" branch and merge the changes into "main"
using git.


Regards
Harri