Michael Haggerty

`git imerge --help` is intercepted by the `git` executable (i.e., `git-imerge` itself never runs). I believe that `git` then looks for and outputs a manpage called `git-imerge`. Since there is...

> Do you know that -h works even when --help does not? I guess the git launcher hijacks `--help` but not `-h`.

You can kindof tell how big the current autofill will be by looking at the test merges that it did just before it started autofilling. But I agree that it...

Hi @waldyrious! > [...] I was wondering whether creating this kind of helper commits could be automatically managed by git-imerge, i.e.: whenever git-imerge finds a conflict, it could be that...

Thanks for the patch! :sparkles: I agree that ``` git imerge start --goal=rebase --first-parent BRANCH ``` is confusing, because it is backwards to the direction of `git rebase`; it rebases...

@bozzzzo: Thanks for the explanation. That makes sense and I can see that it would be a useful feature. Regarding the patch itself: 1. It is an awful lot of...

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...

Unfortunately I cannot reproduce this error with the current value of the branches that you mentioned. Do you happen to know what the branches' SHA-1s were at the time of...

@Stunner: I am unable to reproduce the problem, even using those exact commits. Can you tell me exactly what versions of git-imerge, Git, and what OS you are using? Also...

I agree that this is confusing. It is a historical artifact from the way `git imerge start` was originally implemented. I think the best way to solve this problem would...