From: Johannes Sixt <J.Sixt@eudaptics•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH] rebase -i: fix squashing corner case
Date: Fri, 24 Aug 2007 09:18:45 +0200 [thread overview]
Message-ID: <46CE8655.1DD79C48@eudaptics.com> (raw)
In-Reply-To: Pine.LNX.4.64.0708222334510.20400@racer.site
Johannes Schindelin wrote:
>
> When squashing, rebase -i did not prevent fast forwards. This could
> happen when picking some other commit than the first one, and then
> squashing the first commit. So do not allow fast forwards when
> squashing.
This indeed fixes the problem. Hence:
Acked-by: Johannes Sixt <johannes.sixt@telecom•at>
Junio, please apply.
-- Hannes
prev parent reply other threads:[~2007-08-24 7:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-21 15:10 bug in rebase--interactive with squash and conflicts Johannes Sixt
2007-08-23 8:55 ` [PATCH] rebase -i: fix squashing corner case Johannes Schindelin
2007-08-24 7:18 ` Johannes Sixt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46CE8655.1DD79C48@eudaptics.com \
--to=j.sixt@eudaptics$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox