Waldir Pimenta
Waldir Pimenta
It uses the default merge message, as described [here](https://github.com/mhagger/git-imerge#log-messages-for-pairwise-merge-commits). It looks like that when the tldr pages entry was [created](https://github.com/tldr-pages/tldr/pull/934), back in June 2016, the default for `git imerge continue`...
> It would also help to have documentation that shows how to resume a merge you stopped earlier. You can find that here: https://github.com/mhagger/git-imerge#suspendingresuming That section also mentions how to...
Oh, by the way, this seems to be a duplicate of #123. WDYT, @jacob-keller?
Just a small style suggestion: how about "rotating" the `..` in the vertical part of the map? ``` Map: o-0-1-2..32 origin/master 1 : 5 for-non-static ```
Any hints about how one should go about implementing it?
That's very thorough, thanks! > What should happen if the user runs git imerge abort after having been on a detached HEAD? Maybe nothing? Maybe restore to the SHA-1 that...
This would be very useful. So far I've been using the `git-imerge diagram` command every now and then, but a nice progress message would free me of that need (I'd...
I'm just a curious onlooker, very much a git noob, but I did have a similar idea a while ago, let me know if it's what you're talking about or...
> It is approximately true that a merge only fails if there is a conflict within a single hunk of the diff. Since `git add -p` works hunk by hunk,...
I think every link should have a description. Even the blog posts could use a short summary. You could move the items without descriptions to a separate document, and only...