Elijah Newren writes:
> [As an aside, I know there are multiple other outstanding emails for
> me to respond to, unrelated to this patch. I'll try to get some time
> in the next day or two to respond. Just responding to this one since
> Junio mentioned picking it up for 2.18.]
Thanks for a
On Tue, Jun 19, 2018 at 5:46 AM, Phillip Wood wrote:
> From: Phillip Wood
>
> Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin",
> 2017-02-09), when a commit marked as 'reword' in an interactive rebase
> has conflicts and fails to apply, when the rebase is resumed that
From: Phillip Wood
Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin",
2017-02-09), when a commit marked as 'reword' in an interactive rebase
has conflicts and fails to apply, when the rebase is resumed that commit
will be squashed into its parent with its commit message
3 matches
Mail list logo
