git-imerge
git-imerge copied to clipboard
mhagger
Incremental merge for git
When I run imerge --goal-rebase-with-history, I see commit messages like below imerge 'rebase_8.1': automatic merge 9-1 Could you please provide an option to retain the commit message of the commit...
I'm writing this up in a little more detail because @waldyrious [asked about it](https://github.com/mhagger/git-imerge/pull/90#issuecomment-231526542). It would be nice to allow an in-progress rebase to be simplified to "lock in" the...
Hello, Here's an implementation for a 'status' command, as discussed. Let me know what you think. Cheers! JR
Attempted to do: `git imerge start --name=rc1 --first-parent v` to get shell completion of the HEAD ref. (All tags are prefixed with `v`.) However, the completion at that point only...
I am trying to rebase this PR https://github.com/Olga-Yakovleva/RHVoice/pull/21 and the latest `git-imerge rebase` reports this status. ``` The following commits on the to-be-merged branch are merge commits: 7702e778199fd58dfc7235cfef2140fb98fdedd7 5ac10c5663ceb46c2ef571269f3a510a99bb6862 1d66d788ddbcd875a59b6d30e48a057d500429ca...
If one of the branches has lots of commits, the diagram can become too wide for the terminal and even wrap around, which makes it very hard to read. Here's...
Hi It's been more than 2 hours that git imerge is doing autofilling. I'm not aware of the algorithm details, but it looks like it recomputes the same autofilling sequence...
git has [`rebase.autoStash`](https://git-scm.com/docs/git-config#Documentation/git-config.txt-rebaseautoStash) option and it's very handy with regular rebases. Would be great if imerge supported it for `rebase`/`rebase-with-history`.
This is an effort that I just started, but I wanted to open up this PR for any suggestions/comments/concerns as the process is underway. My intent is to make the...
