Hi Phillip,
On Mon, 18 Jun 2018, Phillip Wood wrote:
> On 17/06/18 20:28, Johannes Schindelin wrote:
> >
> > On Sun, 17 Jun 2018, Phillip Wood wrote:
> >
> >> On 17/06/18 06:37, Elijah Newren wrote:
> >>> Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper
> >>> builtin",
Phillip Wood writes:
>> Oh, you're right, the fast-forwarding path would pose a problem. I think
>> there is an easy way to resolve this, though: in the case that we do want
>> to amend the to-be-reworded commit, we simply have to see whether HEAD
>> points to the very same commit mentioned in
Hi Johannes
On 17/06/18 20:28, Johannes Schindelin wrote:
> Hi Phillip,
>
> On Sun, 17 Jun 2018, Phillip Wood wrote:
>
>> On 17/06/18 06:37, Elijah Newren wrote:
>>> Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin",
>>> 2017-02-09), when a commit marked as 'reword' in
Hi Phillip,
On Sun, 17 Jun 2018, Phillip Wood wrote:
> On 17/06/18 06:37, Elijah Newren wrote:
> > 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
Hi Elijah,
On Sat, 16 Jun 2018, Elijah Newren wrote:
> 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
Hi Elijah,
On 17/06/18 06:37, Elijah Newren wrote:
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
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 taken.
The issue can
7 matches
Mail list logo