Discussion
Loading...

#Tag

  • About
  • Code of conduct
  • Privacy
  • Users
  • Instances
  • About Bonfire
Paris Marx
@parismarx@mastodon.online  ·  activity timestamp last week

Every month I put together a bunch of great reads and important tech stories you might have missed.

The latest edition is out now! Become a subscriber to get full access.

https://disconnect.blog/what-you-missed-in-november-2025/

#tech #newsletter #vcs #paramount #hollywood #politics

  • Copy link
  • Flag this post
  • Block
d@nny disc@ mc² boosted
mirek kratochvil
@exa@mastodon.online  ·  activity timestamp 3 months ago

I added some minor documentation on how to use werge with git as mergetool and merge driver: https://github.com/exaexa/werge#integration-with-git It gets quite comfortable to use with proper config.

(Screenshot: random commit from linux vfs)

#git #vcs

Screenshot of linux source code showing a diff of very small changes highlighted per character instead of per line.
Screenshot of linux source code showing a diff of very small changes highlighted per character instead of per line.
Screenshot of linux source code showing a diff of very small changes highlighted per character instead of per line.
  • Copy link
  • Flag this post
  • Block
mirek kratochvil
@exa@mastodon.online  ·  activity timestamp 3 months ago

I added some minor documentation on how to use werge with git as mergetool and merge driver: https://github.com/exaexa/werge#integration-with-git It gets quite comfortable to use with proper config.

(Screenshot: random commit from linux vfs)

#git #vcs

Screenshot of linux source code showing a diff of very small changes highlighted per character instead of per line.
Screenshot of linux source code showing a diff of very small changes highlighted per character instead of per line.
Screenshot of linux source code showing a diff of very small changes highlighted per character instead of per line.
  • Copy link
  • Flag this post
  • Block
Log in

bonfire.cafe

A space for Bonfire maintainers and contributors to communicate

bonfire.cafe: About · Code of conduct · Privacy · Users · Instances
Bonfire social · 1.0.1-alpha.8 no JS en
Automatic federation enabled
  • Explore
  • About
  • Members
  • Code of Conduct
Home
Login