* Question regarding commit fd2dccaabb2e28cf875d7d81c7faf90f7941f56b
@ 2020-01-01 20:18 Peter Müller
2020-01-02 16:01 ` Arne Fitzenreiter
0 siblings, 1 reply; 2+ messages in thread
From: Peter Müller @ 2020-01-01 20:18 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
Hello Arne, hello list (CC'ed),
I just noticed commit fd2dccaabb2e28cf875d7d81c7faf90f7941f56b was merged
into the "master" branch of https://git.ipfire.org/?p=ipfire-2.x.git;a=summary ,
but does not seem to be applied to the "next" branch, too.
Is this intentional? If yes, why?
Anyway:
> #define YEAR 2020
> #include <bestwishes>
> #include <peace>
> #include <security>
:-)
Thanks, and best regards,
Peter Müller
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Question regarding commit fd2dccaabb2e28cf875d7d81c7faf90f7941f56b
2020-01-01 20:18 Question regarding commit fd2dccaabb2e28cf875d7d81c7faf90f7941f56b Peter Müller
@ 2020-01-02 16:01 ` Arne Fitzenreiter
0 siblings, 0 replies; 2+ messages in thread
From: Arne Fitzenreiter @ 2020-01-02 16:01 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 658 bytes --]
Am 2020-01-01 21:18, schrieb Peter Müller:
> Hello Arne, hello list (CC'ed),
>
> I just noticed commit fd2dccaabb2e28cf875d7d81c7faf90f7941f56b was
> merged
> into the "master" branch of
> https://git.ipfire.org/?p=ipfire-2.x.git;a=summary ,
> but does not seem to be applied to the "next" branch, too.
>
> Is this intentional? If yes, why?
This happens when a late fix is inserted to a core and i have forgotten
to merge the
master into next tree afterwards. thx for the information.
Arne
>
> Anyway:
>> #define YEAR 2020
>> #include <bestwishes>
>> #include <peace>
>> #include <security>
>
> :-)
>
> Thanks, and best regards,
> Peter Müller
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-02 16:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-01 20:18 Question regarding commit fd2dccaabb2e28cf875d7d81c7faf90f7941f56b Peter Müller
2020-01-02 16:01 ` Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox