git-imerge
git-imerge copied to clipboard
docs for autofill, init, reparent, list and remove
Some are probably obvious but it would be good to have them. Also I can't find how to run a test script after a tiny merge. Thanks.
The subcommands can all be listed via
git-imerge --help
And more help about each subcommand is available via git imerge SUBCOMMAND --help
; for example,
$ git imerge autofill --help
usage: git-imerge autofill [-h] [--name NAME]
optional arguments:
-h, --help show this help message and exit
--name NAME name of incremental merge to autofill
So I guess you are asking for documentation for these commands in the main README file?
Regarding testing: there are some crude scripts for creating a test repository and running git-imerge
against it:
-
t/create-test-repo
-- create a test repository undert/tmp
-
t/test-unconflicted
-- run a couple of non-conflicting incremental merges against the temporary repository -
t/test-conflicted
-- run a couple of conflicting incremental merges against the temporary repository
These are not automated tests in the sense that they don't check that the results are correct (you need to use your eyeballs for that). But at least they exercise part of the code and often flush out silly programming errors.