Hi Josselin,
Josselin Poiret writes:
> Hi everyone,
>
> Maxim Cournoyer writes:
>
>> I'm not a 'git log' expert myself, but intuitively like you, I'd expect
>> the --no-merges one to be useful to hide merge commits! The doc seems
>> to confirm that:
>>
>> --no-merges
>> Do not
Hi everyone,
Maxim Cournoyer writes:
> I'm not a 'git log' expert myself, but intuitively like you, I'd expect
> the --no-merges one to be useful to hide merge commits! The doc seems
> to confirm that:
>
> --no-merges
> Do not print commits with more than one parent. This is
>
Hi Giovanni,
Giovanni Biscuolo writes:
> Hi Maxim,
>
> Maxim Cournoyer writes:
>
>> As discussed previously in this thread, a good policy would be to
>> suggest avoid *both* rebases and merges during a feature branch
>> development. This way we avoid both problems,
>
> I read the whole thread
Hi Maxim,
Maxim Cournoyer writes:
> As discussed previously in this thread, a good policy would be to
> suggest avoid *both* rebases and merges during a feature branch
> development. This way we avoid both problems,
I read the whole thread and AFAIU the (only?) problem with the "merging
Hello,
please consider I am (was?) a /great/ fan of rebase, but I have to admit
that "the golden rule" [1] of rebasing makes sense: «never rebase on a
public branch.»
Leo Famulari writes:
> On Sun, Jun 11, 2023 at 08:47:54PM -0400, Maxim Cournoyer wrote:
>> I'm not sure how that'd work, since
Hi Leo,
Leo Famulari writes:
> On Sun, Jun 11, 2023 at 08:47:54PM -0400, Maxim Cournoyer wrote:
>> I'm not sure how that'd work, since Git only allows a single PGP
>> signature per commit, as far as I can tell. When you rewrite the
>> history (by using rebase, say), the existing signatures of
On Sun, Jun 11, 2023 at 08:47:54PM -0400, Maxim Cournoyer wrote:
> I'm not sure how that'd work, since Git only allows a single PGP
> signature per commit, as far as I can tell. When you rewrite the
> history (by using rebase, say), the existing signatures of the rewritten
> (rebased) commits are
Hi Andreas,
Andreas Enge writes:
> Hello,
>
> Am Sun, Jun 11, 2023 at 06:10:37PM -0700 schrieb Felix Lechner:
>> That was probably a misunderstanding. I meant to suggest with some
>> trepidation that 'master' is merged into the feature branch, and then
>> the feature branch is merged back into
Hello,
Am Sun, Jun 11, 2023 at 06:10:37PM -0700 schrieb Felix Lechner:
> That was probably a misunderstanding. I meant to suggest with some
> trepidation that 'master' is merged into the feature branch, and then
> the feature branch is merged back into 'master'. I thought the two
> merge commits
Hi Felix,
Felix Lechner writes:
> Hi Maxim,
>
> On Sun, Jun 11, 2023 at 5:48 PM Maxim Cournoyer
> wrote:
>>
>> When you rewrite the
>> history (by using rebase, say), the existing signatures of the rewritten
>> (rebased) commits are replaced with new ones generated from your key.
>
> That was
Hi Maxim,
On Sun, Jun 11, 2023 at 5:48 PM Maxim Cournoyer
wrote:
>
> When you rewrite the
> history (by using rebase, say), the existing signatures of the rewritten
> (rebased) commits are replaced with new ones generated from your key.
That was probably a misunderstanding. I meant to suggest
Hi Felix,
Felix Lechner writes:
> Hi Maxim,
>
> On Sun, Jun 11, 2023 at 2:26 PM Maxim Cournoyer
> wrote:
>>
>> rebasing causes the PGP-signed commits to be resigned with the key of
>> the people of does the rebase, which obfuscates the origin seal
>> somewhat.
>>
>> I think we should continue
Hi Maxim,
On Sun, Jun 11, 2023 at 2:26 PM Maxim Cournoyer
wrote:
>
> rebasing causes the PGP-signed commits to be resigned with the key of
> the people of does the rebase, which obfuscates the origin seal
> somewhat.
>
> I think we should continue to prefer merging
Let's take your argument all
Hi Andreas,
Andreas Enge writes:
> Hello,
>
> Am Sat, Jun 10, 2023 at 11:17:44PM -0400 schrieb Maxim Cournoyer:
>> > That to me says this should go to staging.
>> Correct. Except there's no staging branch anymore. I guess we should
>> create one? :-)
>
> I would say it should go to a team
14 matches
Mail list logo
