@jugglerchrisChris Emerson @jamieJamie Gaskins @fasterthanlimeamos The security liability is that you can hide code changes in merge conflict diffs which do not show up in the history diff views without providing extra parameters.

Here’s a neat demonstration: https://tavianator.com/2025/sneaky.html

#git #security

Legend for a reason 💪

#linux #git

#Git v2.53.0 is out:

https://lore.kernel.org/lkml/xmqq4inz13e3.fsf@gitster.g/

Some of the highlights:

* Both "git apply" and "git diff" learn a new whitespace error class, "incomplete-line".

* "git blame" learns "--diff-algorithm=<algo>" option.

* Halve the memory consumed by artificial filepairs created during "git diff --find-copies-harder", also making the operation run faster.

* Add a new manual that describes the data model (https://github.com/git/git/blob/master/Documentation/gitdatamodel.adoc – see also: https://jvns.ca/blog/2026/01/08/a-data-model-for-git/ )

Game of Trees 0.121 released https://www.undeadly.org/cgi?action=article;sid=20260201110851 #openbsd #gameoftrees #got #git #development #sourcecontrol #versioncontrol #freesoftware #libresoftware

The Disconnected Git Workflow:
Using git-send-email while being offline and with multiple email accounts

https://ploum.net/2026-01-31-offline-git-send-email.html

#git #offline

«Sending patches via email with Git»

https://en.andros.dev/blog/75beece9/sending-patches-via-email-with-git/

When thinking about working with a friend on a small project, we instinctively create a repository on GitHub or GitLab. This practice, or reflex, is relatively modern. But although it may seem strange, you can collaborate on projects without using Git hosting services. Though it may seem unthinkable, these services didn't exist before, and software was developed with equal or better quality.

#git

As an open source maintainer, I really like the git-send-mail workflow because I can easily review patches in neomutt and apply them with "git am".

But I’m totally lost when git am fails because there’s no way to see the conflict nor to resolve it. Git repository is in AM-pending state and I can’t do anything meaningful but "git am --abort".

There’s surely a way.

#git #mutt

For everyone wanting to test out OS/1337 there's good news:

You can just clone the #git repo or pull it as #zip:
https://github.com/OS-1337/OS1337

and then just run ./scripts/build.sh

and within a few mins it'll spit out a bootable #1440kB image in /build/0.CORE/ to put on a 3,5" FDD or run in a VM [may it be #QEMU or #VirtualBox]...

Thanks to @SweetAIBelleSweetAI Belle for the generous contributions!

#OS1337 #Linux #Development #Embedded #EmbeddedLinux #CLI #TUI #minimalist #OS #FLOSS #OSS #FOSS

Git enhancement proposal: rename "commit" to "perpetrate".

#git

Can anyone recommend a Git host, not open-source-only, that definitely does not feed your repos into an AI? Ideally one with no AI tools at all, but I'll take what I can get. Self-hosting is a no-go in this case.

So this rules out Codeberg (open source only), but I'm not sure about Bitbucket or Gitlab. Obviously Github is out of the question.

#git

Git Rebase for the Terrified

Link: https://www.brethorsting.com/blog/2026/01/git-rebase-for-the-terrified/
Discussion: https://news.ycombinator.com/item?id=46530920

#git

Fossil versus Git

Link: https://fossil-scm.org/home/doc/trunk/www/fossil-v-git.wiki
Discussion: https://news.ycombinator.com/item?id=46586385

#git

Somehow I'm back in the world of looking at server software options and I'm liking the look of Gitea (for self-hosting git repos).

https://about.gitea.com/products/gitea/

#Gitea #Git

Why did Gentoo choose Codebeg over alternatives?

#gentoo #git #github #codeberg

Show HN: 48-digit prime numbers every git commit

Link: https://textonly.github.io/git-prime/
Discussion: https://news.ycombinator.com/item?id=46454369

#git

And here's a more technical #introduction, given Hachyderm's focus:

I've been an #OpenSource and #Linux user for about 10 years, recently moved the work laptop from #Manjaro and #XFCE to #Fedora and #GNOME.

At #GitLab I create #documentation with #Markdown. We do #DocsAsCode and lint them with #Vale. I use #VSCode and I'm good at #Git.

I used to co-organize a #Python meetup in Warsaw.

I published new releases of some of my projects today:

Feedlynx saves links to read/watch later, and exposes them as an RSS feed. The new version detects duplicate links & lets you know you have already saved that link. I also tweaked the Firefox extension to handle this. https://github.com/wezm/feedlynx

git-grab clones git repos into a standard file-system hierarchy, bringing order to all the random repos you clone. The new version improves the clipboard support. https://github.com/wezm/git-grab

#rss #git

Package managers keep using Git as a database, it never works out

Link: https://nesbitt.io/2025/12/24/package-managers-keep-using-git-as-a-database.html
Discussion: https://news.ycombinator.com/item?id=46391514

#git

Archiving Git branches as tags

Link: https://etc.octavore.com/2025/12/archiving-git-branches-as-tags/
Discussion: https://news.ycombinator.com/item?id=46357362

#git

#git

I managed to sign a whole bunch of commits with the wrong id, and I wanted to preserve the commit and author date

these two commands do the same and sign each commit with the id specified in the local .git/config or the global ~one

git rebase -i --root --committer-date-is-author-date --exec 'GIT_COMMITTER_DATE=$(git log -1 --format=%cd) GIT_AUTHOR_DATE=$(git log -1 --format=%ad) git commit --amend --no-edit --reset-author -S'

or

git rebase -i --root --committer-date-is-author-date --exec 'GIT_COMMITTER_DATE=$(git log -1 --format=%cd) git commit --amend --date="$(git log -1 --format=%ad)" --no-edit --reset-author -S'

the rebase flag --committer-date-is-author-date works in tandem with the environment variables in the exec commit

if i only rebase one commit a time eg. HEAD~1, then I can omit the --committer-date-is-author-date

Some info parsed from the bastille git repository.

Highlights:
- 7 years old
- 120 contributors
- 1.37MiB
- 3200+ commits

(check out `onefetch` pkg to query your own repositories)

#FreeBSD #BastilleBSD #onefetch #git

@jwildeboerJan Wildeboer 😷 @sashin

Have you heard any recent updates on the federation? Last time I checked (a few months back) it seemed to be in the "nice to have" category but not particularly actively being worked on.

#git #gitForge #federation #ActivityPub #codeberg #forgejo

If you have any new years resolutions that involve learning, then come learn with me :) I'm running some holiday specials! https://prelude.tech/upcoming_training

#django #htmx #alipinejs #airflow #tailwindcss #git #playwright

Commit 12: Heute möchten wir ein Feature-Komplex vorstellen, was zeigt warum #Coderberg / #Forgejo defintiv das #git für's #Fediverse ist !!!

👉 Forgejo Federation 👍

Bereits via Activity Pub umgesetzt:

- Federated Repository Stars
- User Following
- F3 (Friendly Forge Format)

Schaut doch mal beim #wartenAuf39c3 in die Roadmap:

https://y.lab.nrw/jek25-12

\__
#jek25 #cccRegio #OpenSource #FOSS #adventskalender #39c3

Commit 13: Gestern gab's die Implementierung, heute das Protokoll. Genauer gesagt, die #ActivityPub Erweiterung:

@forgefed

Das ganze hat ein #nlnet Funding und bringt #Fediverse und #git deutlich näher zusammen. Während wir also beim #wartenauf39c3 sind. Könnten wir uns doch mal überlegen ob, wie, wo, wann, warum wir uns da einbringen, hier das Spec-Repo:

https://y.lab.nrw/jek25-13

\__
#jek25 #cccRegio #OpenSource #FOSS #adventskalender #39c3 #forgejo #codeberg @nlnet

Guarding My Git Forge Against AI Scrapers

Link: https://vulpinecitrus.info/blog/guarding-git-forge-ai-scrapers/
Discussion: https://news.ycombinator.com/item?id=46241849

#git

Die nächste #OSS #Spende geht von mir in diesem Monat an @Codeberg. Eine sehr gute GitHub Alternative (natürlich nicht der gleiche Funktionsumfang) und pfeilschnell 🙂. Mittlerweile habe ich meine neuen #Git Repositories da angelegt. Auch hier: vielen Dank für eure Arbeit! #donation https://www.codeberg.org

No matter if you vibe code or not. Using and understanding #git remains important. Here are three advanced aliases I regularly use: https://levelup.gitconnected.com/3-practical-git-aliases-for-power-users-a42b99cb0d80
#blog #Medium #devops #programming

I recently wrote a #blog article about multitasking with #git. Did you already know about the #worktree feature?

https://levelup.gitconnected.com/the-ultimate-guide-to-git-multitasking-58b2970b5b22
#Medium #programming #devops

Show HN: Lockenv – Simple encrypted secrets storage for Git

Link: https://github.com/illarion/lockenv
Discussion: https://news.ycombinator.com/item?id=46189480

#git

Stacked Diffs with git rebase —onto

Link: https://dineshpandiyan.com/blog/stacked-diffs-with-rebase-onto/
Discussion: https://news.ycombinator.com/item?id=46103571

#git

2. Boost Your Git DX

This book covers deep and effective use of command-line Git. It covers aliases and extra tools that integrate with Git, like Less and delta, as well as many commands, from the basic 'add' and 'commit' to the more advanced 'rebase' and 'reflog'.

#Git

📚🧵 It’s Cyber Monday, the last day my books on Git, GitHub and Django will be 50% discounted. Here’s a quick thread to give you a taste of what’s inside each of them.

#Git #GitHub #Django

柔庫(やはぐら)の
　源譜(げんぷ)を落(お)とし
　　手直(てなほ)しを
加(くは)へた算譜(さんぷ)
　頭(かしら)へ接(つ)ぎ木(き)


川音リオ、心の一句。

解説：ソフトウェアリポジトリからソースコードをダウンロードし、モディフィケーションを加えたコードをマスターブランチとマージする。#git

TIL about using pbpaste (on MacOS for example) to directly apply a git e-mail patch that is currently saved to your clipboard:

pbpaste | git apply

(Obviously doesn't carry over the submitters email/name etc, but for tiny changes it makes things easier than exporting mbox)

https://ss64.com/mac/pbpaste.html

#macOS #git

✍️ New post covering my top 8 GitHub CLI (gh) commands to boost your productivity, like `gh repo clone` and `gh pr create`.

Check it out!

https://adamj.eu/tech/2025/11/24/github-top-gh-cli-commands/

#GitHub #gh #Git

Show HN: Gitlogue – A terminal tool that replays your Git commits with animation

Link: https://github.com/unhappychoice/gitlogue
Discussion: https://news.ycombinator.com/item?id=45964956

#git

GitHub: Git Operation Failures

Link: https://www.githubstatus.com/incidents/5q7nmlxz30sk
Discussion: https://news.ycombinator.com/item?id=45971726

#github #git

what's the best #git command that *doesn't* exist?

#git nerds:
I want to store a file with metadata about the files I'm working on, BUT I want it to be invisible.

I'm thinking of using a post-commit hook that stores/updates/whatever this metadata file in a different - specially named - branch behind the scenes (without affecting the working directory).

BUT Something's telling me there's a better solution that I've forgotten. This feels clunky.

Any ideas?

An exposed .git folder let us dox a phishing campaign

Discussion: https://news.ycombinator.com/item?id=45943802

#git

Meeting notes between Forgejo and the Dutch government via Git commits

Link: https://codeberg.org/forgejo/sustainability/pulls/137/files
Discussion: https://news.ycombinator.com/item?id=45929247

#git

@adamchainzAdam Johnson I read your great article:

"Git: share a full repository as a file with `git fast-export`"

https://adamj.eu/tech/2025/07/15/git-share-fast-export/

As far as I know you can also use `git bundle`

Do know what are the differences?

#Git

Mergiraf: Syntax-Aware Merging for Git

Link: https://lwn.net/SubscriberLink/1042355/434ad706cc594276/
Discussion: https://news.ycombinator.com/item?id=45799664

#git

Introducing...

Federated Nexus!!!

Federated Nexus is a community resource hosting multiple public FOSS (especially federated) services, starting with Matrix and Forgejo.

We are also open to suggestions for new services to host, let us know in our Matrix room.

Sign up now (or join our Matrix room for future announcements or to hang out) at https://federated.nexus!

If you have any questions, ask in replies or our Matrix room.

#community #matrix #forgejo #git #selfhost #selfhosting #foss #floss #federated #federate #federateEverything #FederatedNexus #degoogle

There's all good news on the Dutch government front looking into using #FOSS alternatives for their own services and #OpenSource projects.

@janvlug just published a blog post (in Dutch) on how @developerdeveloper.overheid.nl is considering #Forgejo code forge, the #git forge software that #Codeberg host for more than 200k people, serving more than 300k repositories.

https://developer.overheid.nl/blog/2025/11/11/git-forge-overheid

Also follow @Gina updates on Dutch government plans, and participate in the discussions and polls. 💪

https://fosstodon.org/@Gina/115531462437883073

😸😸😸 Woohoo! My new book, Boost Your GitHub DX, is out now! 😸😸😸

It’s about using GitHub more effectively, touring you through the fundamental features with my experience-based commentary. It covers settings, keyboard shortcuts, hidden features, syntax, techniques, CLI commands, and even improving your writing.

Check out the release post for more info and a link to the free sample:

https://adamj.eu/tech/2025/11/11/boost-your-github-dx-out-now/

#GitHub #Git

How long do you keep a Git branch around after you merge it?

I have a habit of deleting the branch immediately after merging, but I've had to use the reflog to recover updates a few times over the last few years. I'm wondering if I should keep branches around a little longer before deleting.

#Python #Git

The (Lazy) Git UI You Didn't Know You Need

Link: https://www.bwplotka.dev/2025/lazygit/
Discussion: https://news.ycombinator.com/item?id=45878578

#git

What’s crazy is that both Linux and Git were built in just a few months 🤯

#linux #git