From: Nico Williams <nico@cryptonector.com>
To: Mark Bauermeister <warfan2007@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Cease and desist for companies and government agencies misusing git
Date: Thu, 30 Oct 2025 10:39:00 -0500 [thread overview]
Message-ID: <aQOGlBhrvtmpbfDJ@ubby> (raw)
In-Reply-To: <CADanQgA3h52hax-mdSTBV-tNDGvNRSxLU217aVygj7Cs7Lu8Bg@mail.gmail.com>
On Thu, Oct 30, 2025 at 04:27:10PM +0100, Mark Bauermeister wrote:
> Long story short. The guy who was responsible for my firing spent a
> good 4 months journaling my work and harassing management behind my
> back only to blow up while on the phone with me, accusing me of such
> heinous crimes as sending a PR from a fork (at a time I didn't have
> write access to the main repository...) and *gasp* REBASING.
>
> This dude is convinced (to a religious fervor) that Linus Torvalds was
> possessed by a demon when he came up with `git rebase` and that in
> order to defeat the devil, we need to plaster merge commits
> EVERYWHERE.
That's nuts!
By the way, Linus did not invent rebasing. We used rebasing at Sun
Microsystems, Inc, (RIP) since 1992. We didn't call it that, but merge
commits were absolutely verboten (they were called "merge turds").
The Solaris engineering organization had thousands of developers, and
often tens of large projects with their own "gates" (forks), and
everyone rebasing all the time, and the end result was linear, easy to
understand history.
Rebase workflows are the only workflows that scale to such project
sizes as Solaris used to be, or as Windows, Linux, etc. are now.
Nico
--
next prev parent reply other threads:[~2025-10-30 15:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-30 15:27 Cease and desist for companies and government agencies misusing git Mark Bauermeister
2025-10-30 15:39 ` Nico Williams [this message]
2025-10-30 19:50 ` Junio C Hamano
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=aQOGlBhrvtmpbfDJ@ubby \
--to=nico@cryptonector.com \
--cc=git@vger.kernel.org \
--cc=warfan2007@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).