Introduction - Steve's Tutorial on Jujutsu, an alternative front-end to git
Jujutsu is essentially an alternative front-end or "porcelain" to git, both magnificiently simplified and powerful.
I tried it after using Emacs Magit for about six or seven years, and jujutsu is really easier to use than git and useful if one wants a tidy public history of changes (with "tidy" and "public" as Linus Torvalds recommends). Plus it is fully compatible to git as backend - other contributors will not even note you are using it.
like this
ICE Campaign of Violence Will Lead to More Deaths
cross-posted from: lemmy.ml/post/33127927
Natasha Lennard
July 12 2025, 7:12 pm"ICE agents detained over 200 people in militarized raids on two large farms in Carpinteria and Camarillo, including a number of US citizen workers and protesters who gathered outside the facilities in response to the raids. As of Saturday morning, at least two of the abducted citizens were still reported missing by loved ones and colleagues.
“Many workers-including US citizens, were held by federal authorities at the farm for 8 hours or more,” the United Farm Workers union said in a statement. “US citizen workers report only being released after they were forced to delete photos and videos of the raid from their phones.”"
ICE Campaign of Violence Will Lead to More Deaths
cross-posted from: lemmy.ml/post/33127927
Natasha Lennard
July 12 2025, 7:12 pm"ICE agents detained over 200 people in militarized raids on two large farms in Carpinteria and Camarillo, including a number of US citizen workers and protesters who gathered outside the facilities in response to the raids. As of Saturday morning, at least two of the abducted citizens were still reported missing by loved ones and colleagues.
“Many workers-including US citizens, were held by federal authorities at the farm for 8 hours or more,” the United Farm Workers union said in a statement. “US citizen workers report only being released after they were forced to delete photos and videos of the raid from their phones.”"
ICE Campaign of Violence Will Lead to More Deaths
Natasha Lennard
July 12 2025, 7:12 pm
"ICE agents detained over 200 people in militarized raids on two large farms in Carpinteria and Camarillo, including a number of US citizen workers and protesters who gathered outside the facilities in response to the raids. As of Saturday morning, at least two of the abducted citizens were still reported missing by loved ones and colleagues.
“Many workers-including US citizens, were held by federal authorities at the farm for 8 hours or more,” the United Farm Workers union said in a statement. “US citizen workers report only being released after they were forced to delete photos and videos of the raid from their phones.”"
ICE Campaign of Violence Will Lead to More Deaths
Jaime Alanis’s death shows the horrific consequences of a secret police force behaving with utter impunity.Natasha Lennard (The Intercept)
adhocfungus likes this.
Looking for a music player
I'm looking for a music player on Pop!_OS that supports playlists, repeating a single track while still being able to swap tracks in the playlist, and also supports fading between songs and when stopping playback. And ideas on what to try?
So far I've tried VLC, Audacious, and Rhythmbox, but none of those seem to support all of those requirements. (Rhythmbox was close but the repeat one from the toolbar plugin doesn't work.)
Edit: Got it working in Rhythmbox after toggling the repeat options a few more times. Still curious if there are other options out there though.
like this
Exclusive: Gaza talks at risk after Israel refuses to withdraw from Rafah
cross-posted from: lemmy.ml/post/33127244
By David Hearst
Published date: 12 July 2025 14:39 BST"Hamas negotiators are increasingly sceptical that a Gaza ceasefire agreement with Israel could be reached in the current round of talks in Doha, Middle East Eye has learned.
Sources close to Palestinian negotiators said talks remain deadlocked over at least two of four key issues.
The first is the extent of the proposed Israeli withdrawal from the Gaza Strip during the 60-day truce. The second is the method of aid distribution."
like this
Exclusive: Gaza talks at risk after Israel refuses to withdraw from Rafah
cross-posted from: lemmy.ml/post/33127244
By David Hearst
Published date: 12 July 2025 14:39 BST"Hamas negotiators are increasingly sceptical that a Gaza ceasefire agreement with Israel could be reached in the current round of talks in Doha, Middle East Eye has learned.
Sources close to Palestinian negotiators said talks remain deadlocked over at least two of four key issues.
The first is the extent of the proposed Israeli withdrawal from the Gaza Strip during the 60-day truce. The second is the method of aid distribution."
Youtube Embedded player acting weird for anyone else?
Feds in Catalonia, Spain think everyone using a Google Pixel must be a drug dealer
Cops in this country think everyone using a Google Pixel must be a drug dealer (Updated) - Android Authority
Pixel phones are criminals' top pick in Spain's Catalonia for their strong security and mod-friendly design.Adamya Sharma (Android Authority)
like this
I'm not looking at strangers' phone screens close enough to figure out if they're using GOS but I've noticed strangers using GOS a fair few times. Likely would a lot more if I were looking for it but I'm not trying to read everyone's phone screens...
It's a fairly common OS and it's fairly widely acknowledged that GOS is a big driver for Pixel sales.
machine translation of a paragraph of the original article:
The police's solution: It's none other than a Trojan. Unable to break the encryption, they infect the traffickers' phones with malware, subject to judicial authorization. This way, they gain full access to the device: apps, images, documents, and conversations. Obviously, GrapheneOS isn't capable of protecting itself (like any Android) against this malware.
::: spoiler original text in Castilian
La solución de la policía. Esa no es otra que un troyano. Ante la imposibilidad de romper el cifrado, infectan los teléfonos de los traficantes con software malicioso, previa autorización judicial. De esta manera, consiguen acceso total al dispositivo: apps, imágenes, documentos y conversaciones. Evidentemente, GrapheneOS no es capaz de protegerse (como cualquier Android) ante este malware.
:::
🤔
"Cada vez que vemos un Google Pixel pensamos que puede ser un narcotraficante". Es el móvil perfecto...
Los Google Pixel son los máximos representantes de Android, con permiso de Samsung. Es por ello que convencen a los usuarios entusiastas del sistema...Pepu Ricca (Xataka Android)
Feds in Catalonia, Spain think everyone using a Google Pixel must be a drug dealer
Cops in this country think everyone using a Google Pixel must be a drug dealer (Updated) - Android Authority
Pixel phones are criminals' top pick in Spain's Catalonia for their strong security and mod-friendly design.Adamya Sharma (Android Authority)
like this
Back at it!
like this
It’s kind of hard to tell for this image, I think the background is probably real, or at least, created separately. but there are a couple sus features in the foreground. Superman’s right hand, the green jacket, and the apparent facial features of children I mentioned before.
It does have a signature in the bottom right, so I guess you could track down the artist to find out for sure, but with my first comment, I was just pointing out the comedy of kids with facial hair.
Delta Air Lines Skirts Tariffs By Repurposing Airbus Engines
The carrier has taken an unconventional approach to avoiding tariffs.
Air Belgium Will Retire All Airbus Aircraft Leaving Just 2 Boeing 747-8Fs In Its Fleet
The airline will not renew the leases of its two remaining A330-200P2F planes.
US Investigators Threatened To Withdraw From Air India Crash Probe Over Slow Progress & Lack Of Transparency
Families of the victims are angry at delays and a lack of information.
$180 Million: Emirates Buys 4 Airbus A380-800s
The Dubai-based carrier continues to buy up its leased A380s.
Ken Klippenstein | I Triggered Another Federal Investigation
The Army’s keystone cops are on the case
Recommend a simple, small cheap laptop < 15" I can chuck in my bag for use in coffee shops!
- I'll buy used, so don't want latest and greatest. It won't be my main laptop.
- to run linux obviously.
- good battery life, light, not too small to use, but large enough to type on (obviously can do without numeric keypad). not too fragile!
- I'll be doing some light python work, perhaps some c/c++ but I'm not after a workhorse, just something for quickly fixing bugs, or making notes on
- sub 200 GBP / 250USD I guess
I'd be interested in hearing recommendations, and also what to avoid!
like this
I got myself an old EEE PC for exactly that purpose. (Except, substitute python with lua).
8h battery life, cost me €20 and does what it's supposed to. Just make sure you get one with an Atom N280 or better. The popular N270 is 32bit only, and more and more programs are dropping 32bit support. Some of them you can DIY compile for 32bit, some you really don't want to.
(For example, compiling Node on an Atom N270 takes around 3 days.)
I had one with an N270 first and replaced it with one with an N450 to get 64bit.
Maxed it out with 2GB RAM, a cheapo €10 SSD that maxes out SATA and overclocked it to 2GHz.
It's not fast by any stretch of the imagination, but it's totally ok for editing text files with Kate and compiling with platformio.
Aylo Sues 'Pirate' Site PornXP, Wants Domains Transferred or Blocked
Adult entertainment conglomerate Aylo, the parent company of Pornhub, has filed a lawsuit against the as-yet-unidentified operators operators of PornXP. The company accuses the website of widespread copyright infringement. After obtaining an early discovery order to unveil the operators through various domain registrars, the case moves forward with site blocking as part of the requested remedies.
Aylo Sues 'Pirate' Site PornXP, Wants Domains Transferred or Blocked * TorrentFreak
Adult entertainment conglomerate Aylo, the parent company of Pornhub, has filed a lawsuit against the yet unknown operators of PornXP.Ernesto Van der Sar (TF Publishing)
like this
like this
Computer Scientists Figure Out How To Prove Lies: An attack on a fundamental proof technique reveals a glaring security issue for blockchains and other digital encryption schemes.
Computer Scientists Figure Out How To Prove Lies | Quanta Magazine
An attack on a fundamental proof technique reveals a glaring security issue for blockchains and other digital encryption schemes.Erica Klarreich (Quanta Magazine)
You can get LLMs to say almost anything you want
You can get LLMs to say almost anything you want
Yes, Prime Minister has a sketch demonstrating how asking a series of leading questions can get a person to a particular conclusion: “Are you worried about the number of young people without jobs?” “Yes.www.greaterwrong.com
Are there any local LLM GUIs with conversation branching like ChatGPT?
like this
GPT4All – The Leading Private AI Chatbot for Local Language Models
Experience true data privacy with GPT4All, a private AI chatbot that runs local language models on your device. No cloud needed—run secure, on-device LLMs for unlimited offline AI interactions.www.nomic.ai
Incontri dal vivo di gruppo di etica digitale
Ciao a todos 😀
Mi chiedevo se ci fossero incontri dal vivo di gruppo tra persone appassionate di etica digitale su Roma. Parlo di incontri informali in cui ci si conosce e si scambiano chiacchiere dal vivo.
Se non ci sono, vi piacerebbe crearne e partecipare? :four_leaf_clover:
like this
reshared this
Re: Incontri dal vivo di gruppo di etica digitale
like this
reshared this
Projectivy Launcher: launcher alternativo per Android TV
Projectivy Launcher: launcher alternativo per Android TV
Projectivy Launcher è un launcher alternativo per Android TV che può sostituire l’interfaccia ufficiale di Google, è super customizzabile e non contiene pubblicità.Me (Pietro Cyber Journal)
Projectivy Launcher: launcher alternativo per Android TV
Projectivy Launcher: launcher alternativo per Android TV
Projectivy Launcher è un launcher alternativo per Android TV che può sostituire l’interfaccia ufficiale di Google, è super customizzabile e non contiene pubblicità.Me (Pietro Cyber Journal)
like this
Blender HDR and the reference white issue | About Blender's HDR support on Wayland
From Sebastian Wick’s Mastodon
Blender is getting HDR on Linux via Wayland before Windows! This isn't by accident, but shows how creating a system with a different design creates better results for users and application developers.
Firefox is in this same boat too. It will get HDR support on Linux* sooner than Windows. Firefox currently only supports HDR on MacOS.
Blender HDR and the reference white issue
The latest alpha of the upcoming Blender 5.0 release comes with High Dynamic Range (HDR) support for Linux on Wayland which will, if everything works out, make it into the final Blender 5.0 release on October 1, 2025.swick's blog
like this
Brain breakthrough: Dopamine doesn't work at all like we thought it did
Brain breakthrough: Dopamine doesn't work at all like we thought it did
Dopamine doesn’t flood the brain as once believed – it fires in exact, ultra-fast bursts that target specific neurons.Bronwyn Thompson (New Atlas)
[ANSWERED] Should i use KeePass* instead of Proton Pass, for privacy?
like this
I think I've done the opposite of most. After using keepassx for the last 4 or 5 years I switched to ProtonPass.
I value security and privacy but Ive realized some of my processes have become too complex, like using syncthing to keep my keepass on my phone and PC aligned. I'm not confident that older man version of me will be able to keep up so Ive stared valuing simplicity.
Im sure many will argue that it is simple but between backups and keys and passwords it really is a lot, especially with a new device each time.
like this
I think I’ve done the opposite of most. After using keepassx for the last 4 or 5 years I switched to ProtonPass.
Me three.
Mamdani appoints top DNC and Obama adviser in bid to secure Democratic Party establishment support
Mamdani appoints top DNC and Obama advisor in bid to secure Democratic Party establishment support
Mamdani has appointed Jeffrey Lerner—a former top Obama White House aide and Democratic National Committee political director—as his communications chief.World Socialist Web Site
proton pass vs simplelogin - aliases
I'm trying to migrate off gmail and apple services and ended up getting a domain and going to proton and using simplelogin for making aliases. But now I'm looking at proton pass, which comes free with my plan and lets me create aliases and wondering why I did that.
Ideally, I want nobody to have my main email address. everything gets an alias and dumps into the main. if the main address is found out, I just kill it and get another and point all the aliases to that. if an alias gets spammy or sold off to obnoxious marketing boobs, I kill the alias and create a new one.
I got started with migrating a few things over today into the aliases I had on my domain with simplelogin. I started to wonder what would happen if I replied to any of these and unlike apple hide-my-mail, it looks like these expose my actual address, unless I go through the trouble of going to simplelogin and getting an reverse alias link through them, which is an annoying pain in the ass. looking to see if there was any integration like apple's icloud had, I find proton pass is included in my mail plus plan and lets me do what simplelogin already was doing, complete with my domain being in the alias address!
So my question is why did I set up two seperate services for this? can I reply to incoming emails from the aliases created in proton pass without them revealing my address?
I have needed to get away from google for a while and am finally getting off my ass to do it, but apple hide my email was so simple to use whereas proton seems to have these weird oversights.
So my question is why did I set up two seperate services for this?
Unfortunate side effect of buying someone else's product instead of just making your own.
can I reply to incoming emails from the aliases created in proton pass without them revealing my address?
Yes. It's called a relay for a reason. When you receive an email it will come from a relay address, not the actual sender. You reply to that relay address and then the other party receives your relay address (alias).
Check out DuckDuckGo, they also have an email alias forwarding system like SimpleLogin. I have a different email address/alias for each account that I have and they all end up in my Proton inbox.
Also, you’re able to reply and send email with the DuckDuckGo address from Proton mail.
@Corduroy_Pillows_Making_Headlines
Created a Post/Group about how to De-Google. The details about my set-up is also there. Hope it helps:
I thought OP wanted to de-google. I use DuckDuckGo because of their duck player; it opens YouTube on a separate window without all the extra stuff you don’t want (just the video you wanted to see). I guess OP can use PeerTube?
I’m quite happy with my Proton Unlimited but it’s not for everyone.
And yeah, I’m a browser hopper.
Yes, you can have multiple duck addresses at the same time. There’s a personal and private duck address.
Composing email:
duckduckgo.com/duckduckgo-help…
About duck addresses:
duckduckgo.com/duckduckgo-help…
I also used SimpleLogin and loved it until I subscribed to the Proton products. Like you, I haven’t needed to use SimpleLogin because of Proton Pass. Haven’t used iCloud since 2021 and have no regrets.
Can I create multiple custom Duck Addresses or Email Protection accounts? - DuckDuckGo Help Pages
You can only have one Duck Address enabled per browser, and only one associated with any given forwarding address.DuckDuckGo
Canonical Plans for a Fully Functional Desktop Session on RISC-V with Ubuntu 25.10
Canonical Plans for a Fully Functional Desktop Session on RISC-V with Ubuntu 25.10 - 9to5Linux
With the upcoming Ubuntu 25.10 release, Canonical plans to achieve a fully functional desktop session on the RISC-V architecture.Marius Nestor (9to5Linux)
like this
If you like working in slow motion, yes, sure.
Source : I have a Banana-Pi SBC banana-pi.org/en/banana-pi-sbc… and... it works, running Linux proper, with a desktop environment, which is in itself pretty cool IMHO but damn, you have to be patient. That being said "just" already being at that stage on economically affordable hardware is amazing. We are probably not far, say few years at most, with usable RISC-V chips for mundane tasks, e.g. text authoring, coding, Web browsing, but don't expect compilation of a browser, Blender, or gaming on this for few more years. IMHO it will go fast because it's catching up so the path is rather well laid down, which is much harder than innovating and pushing the envelope.
Banana Pi BPI-F3 with SpacemiT K1 8 core RISC-V chip,4G RAM and 16G eMMC-Banana Pi open source hardware community,Single board computer, Router,IoT,STEM education
Banana Pi is an open source hardware project lead by Guangdong BIPAI CPA.,LIMITED.It focuses on the open source hardware development board of ARM and MCU series, provides open software and hardware platform, and creates the basic technology developme…www.banana-pi.org
I guess it depends what you mean by "chip production".
AFAICT mostly via Chip War (2022) and reading a bit on the topic there are few bottlenecks, e.g chip design IP like ARM (UK) or lithography machines like ASML (NL) or high efficiency chip production like TSMC (Taiwan) but overall the grip from the US is mostly on democratization and scale with AMD, NVIDIA, Broadcom or even Intel, namely making a LOT of chips, not necessarily high end (some are) or mobile (also some), for a relatively low price. What I mean is that China is already claiming that they are producing about on-par IPS with e.g. Loongson.
So yes there are for sure incumbents based in the US that do not want RISCV and overall open architectures to make significant progress but is it fair to call them "the US" I'm not sure. Are they heavily leaning on US lawmakers to get their positions strengthened? Maybe. Maybe they do not yet do so simply because they don't believe it's a threat yet, nor it might be ever be.
I believe that in chip production you can lock production via innovation but also, like in other sectors, solely with the supply chain. ASML is powerful because they basically own their markets but also because who would contract with newcomers versus a very well established company that can provide all the insurances imaginable that they will indeed deliver on time a specific amount? Why risk it when you are already contracting with the leader?
Sure there is a potential innovator dilemma but what could prevent e.g. NVIDIA or Intel to switch to RISC-V if somehow they can dominate there too thanks to both their existing expertise but also supply chain stronghold?
Risc v is an instruction set architecture not a chip design, the actual hardware implementation of any given risc v processor won't necessarily be open source and available to all, it's just a guarantee that if the spec is implemented then code compiled for risc v will run on a RISC V processor.
China has had access to x86 for years, they've not been able to implement a chip on par with current gen AMD or Intel chips.
US sanctions massively setback RISC-V.
We would have had the Milk-V OASIS last year , something better by now, and the answer to “as good as ARM” would be yes.
But Sophgo, the company making the SoC was accused of helping Huawei get access to restricted technology. So TSMC refused to make their chips. And the Milk-V OASIS was cancelled.
Massive blow to RISC-V.
The Jewish diaspora must confront what Israel is doing in our name
Judaism is not Zionism, and those who argue they are one and the same are being fundamentally dishonest. Yet collectively, Jews are often held responsible when the world's only Jewish state claims to act in our name.
The Jewish diaspora must confront what Israel is doing in our name
The genocide in Gaza, backed by diaspora institutions, requires us to challenge the Jewish mainstream's embrace of a fascistic IsraelMiddle East Eye
like this
paequ2
in reply to HaraldvonBlauzahn • • •Ooooh, that's interesting.
HaraldvonBlauzahn
in reply to paequ2 • • •Another useful property is that while jujutsu does have worktrees, like git, in many cases where one would use git worktrees (for example when writing accompanying documentation ) it is just easier to use another line of changes (what is a branch in git).
Alas, that jujutsu does not store local change sets automatically on a remote git repo (this happens only when you update and push a git branch), means that still-mutable local changes are not automatically transferred to another computer you work on. And unpublished changes are naturally mutable in jujutsu. But you can safely copy a jj repo via rsync, as changes in jj metadata are thread-safe and atomic. The other way is of course to push a work-in-progress ("WIP") git branch which can mutate and is therefore not allowed to be merged by other people.
ugo
in reply to HaraldvonBlauzahn • • •That’s not really how one would use worktrees in git. Worktrees are useful in the case when e.g. you are working on version 0.15 of your software that has many breaking changes to version 0.14 (perhaps even on a build system level) and you need to release a 0.14.1 patch. Worktrees separate directories which means you don’t need to stash or do a wip commit, nor clear you 0.15 build artefacts. Just cd to a different worktree, checkout the 0.14 branch, create and checkout the 0.14.1 branch, clear build artifacts in a different directory from your main development one, and start working.
When done, just cd back and keep working again without switching branches, clearing artifacts, or doing full rebuilds of the in-development 0.15 version.
Plus, git does not store change sets or branches or anything on any remote unless you push them either, so if you’re having that problem just stop pushing things you don’t want to push. You can totally rsync a git repo, just ensure it’s at rest. Otherwise do what you should be doing anyway: set the repo on another machine as a remote of the other repo, so you can
git pull my_private_machine feature/my_private_branch
without needing to push to a central repo.I’m sure jujutsu has many advantages, but it also reads to me like you’re misunderstanding the git model. Which can be a fair critique of git to be fair, but then we would need to talk about what about the git model people have trouble with, why, and how to address those issues, and so far I haven’t seen any kind of research in that direction from jujutsu (not that I’ve been looking particularly hard)
HaraldvonBlauzahn
in reply to ugo • • •One difference between using worktrees and branches in git is that in git you usually have uncommited stuff that's not finished, and worktrees are a way to avoid committing this. And you want to avoid committing early because it is hard to clean-up later. This hesistsnce to commit is not necessary at all in jujutsu - any change to the source files is already captured and will be restored once you go back to that changeset. There are other cases where you use worktrees in git e.g. to isolate a build and an hour-long integration test running it in parallel to your ongoing work, and in thar cases, you'd use workspaces in jujutsu like you'd in git.
Too many commands that do subtly and irreversivly things on the repo, with potentially messed-up interim states, only to do the conceptually much simpler task to edit and manipulate the directed acyclic graph of commits.
In short, jujutsu is a commit graph editor and does the same with perhaps 10% of the complexity of git. The man pages on the git reset, branch and merge commands are already larger than the whole - and detailed!- documentation of jujutsu.
Steve Klabnik explains this much better than I can here in his blog that I posted.
ugo
in reply to HaraldvonBlauzahn • • •It is simply not my experience that cleaning up commits after committing early is difficult in git. Amending a commit is a single
-a
flag away from thegit commit
command. The opposite problem is when you do too much work and want to split it into multiple commit rather than a huge one, in which casegit add -p
is again a single flag away fromgit add
.In general, git’s entire model is to allow you to work first, and do administrative tasks (including tidying up your commit history etc) later.
And almost nothing is truly destructive in git, the vast majority of cases can be fixed by judicious use of
git reflog
.The only cases I’ve ran into where git repos became corrupted were caused by external tools, mainly GUIs that label buttons with git commands that do something different when clicked (like the button labeled
push
actually doinggit push —all
for no good reason, and such things) with users that have no idea how git works that have been trained just by telling them “click this to save your work, click this to get the last version of the code”Sickday likes this.
HaraldvonBlauzahn
in reply to ugo • • •ugo
in reply to HaraldvonBlauzahn • • •HaraldvonBlauzahn
in reply to ugo • • •atzanteol
in reply to paequ2 • • •Technically true - but it looks like
jj
does a lot of history re-writing which would require a lot of care to be taken when working on a shared codebase.The page on remotes has some cautions in it.
Working with remotes, e.g., GitHub - Steve's Jujutsu Tutorial
steveklabnik.github.ioHaraldvonBlauzahn
in reply to atzanteol • • •jj
by default refuses to change any commits on published branches such as a master branch that has been pushed. The details are configurable.BTW that's why I linked Linus Torvalds mail on when and why to rewrite history - it is good advice.
ViatorOmnium
in reply to HaraldvonBlauzahn • • •priapus
in reply to HaraldvonBlauzahn • • •atzanteol
in reply to HaraldvonBlauzahn • • •Hrm... It looks interesting but it seems too dedicated to crafting "the perfect commit".
I don't want to "evolve a commit" - I want to capture my changes over time. If I decide later that I want to prepare the commit for merging I will.
I hate it because it's different - but even trying to give it a "benefit of the doubt" I really can't see this as better. It's not like it's difficult to create a "tidy" commit with git as is.
And as far as "easier to use goes"... well... Here's how you get a list of anonymous branches
And since they eschew branches with names you get to memorize hash strings instead of branch names that describe the thing you were doing?
I'm unconvinced. Though
jj undo
looks neat (and also crazy dangerous unless you can undo an undo?).HaraldvonBlauzahn
in reply to atzanteol • • •No trouble, you can still name branches if you want. And no, you don't have to type the whole changeset hash, the first one to three letters are usually sufficient.
Also, branch names are not a permanent thing, they disappear after you merged them.
If you want, to can put an empty commit with the description of what you want to do at the top of your changes, and then use "jj split" to move changes to different commits before it.
There are several common work flows which are explained in Klabnik's blog post.
HaraldvonBlauzahn
in reply to atzanteol • • •Yeah you can undo undo and also resurrect undone states.
If the readability of the commit history really does not matter to you - for exsmple, nobody needs to read this code again - it's possible that jj does not give you enough advantage. Everyone works different.
atzanteol
in reply to HaraldvonBlauzahn • • •I mean... It does and I will use git to manage commit histories as necessary. I don't see
jj
as solving that problem or even making it easier. Doing a single squash-commit or arebase -i
when I merge a branch is relatively trivial.And from what I can tell it's much easier to do a
git pull upstream master
than to dojj new skdfsld dskfjas
since you'll likely have to lookup those hashes? I mean I wouldn't remember them.HaraldvonBlauzahn
in reply to atzanteol • • •atzanteol
in reply to HaraldvonBlauzahn • • •HaraldvonBlauzahn
in reply to atzanteol • • •One takes them from the last commit log and uses the first few letters. Steve Klabnik shows how they are used in practice. It makes no sense to repeat it here.
atzanteol
in reply to HaraldvonBlauzahn • • •So - it's not the length of the random garbage that is the issue it's the fact that it's random garbage that I have no chance of remembering after 5 seconds and switching between branches. All my branches are instead random hashes that I'll need to lookup or remember.
I've read through the blog. It sounds like they've taken the minor inconvenience of doing a
git merge --squash
and distributed that pain across every-single-commit you're ever going to make instead. All to get "tidy commits" which were possible before anyway.I was actually rather interested in the idea of jj being something that made history-rewriting easier (e.g. for removing bad commits with passwords and the like). But the fact that it almost completely throws out the entire concept of working on named branches (yes you can have them - but "One interesting thing about branches in jj that's different than branches in git is that branches do not automatically move." - genius) is just ridiculous. And to claim that it's now simpler just seems like gaslighting.