Tom Rocheskippable when not outright weird
Saagar sits down with Candace Owens to talk Daily Wire firing, Israel, and why she's supporting Trump in 2024.
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: www.breakingpoints.com
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom RocheVERY EXCELLENT interview covering /much more/ than (from the episode headline) 'Trump, Elon, and Russia'. Firstly, note there's very little about Musk, and that's only very near the end. What the interview /does/ cover is mostly the intersection of US {political economy, deepstate, journalism}, including
* 1990s Russia, esp [/The eXile/](http://exiledonline.com/vanity-fair-profiles-the-exile/)
* [GFC](https://en.wikipedia.org/wiki/Global_Financial_Crisis) corruption, esp the nexus of {US Big Finance aka Wall St, Obama CorpDems}
* 2016 presidential campaign: USCFM pro Hillary anti Trump
* getting canceled as just another Russiagate silencing
* US journalism politics and monetization esp Substack, Intercept/Omidyar, Twitter Files (where Musk briefly discussed)
... "and much, much more," well worth 110 min (provided you skip all the ads) of your time.
American author and journalist Matt Taibbi joins Ryan and Emily.
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: www.breakingpoints.com
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom RocheEXCELLENT Felix+Will+guest, though actually about St Louis rather than Missouri-more-generally. After a brief celebration of Donald Sutherland 1935-2024, topics covered include
* Cori Bush vs Wesley Bell
* Coldwater Creek: Cold War, cancer, environmental racism (for real, not just wokery)
* (episode focus) the Veiled Prophets as elite evil
* McDonnell-Douglas (now part of the Boeing crime family): corruption and hijinks in the military-industrial complex
Happy Summer Solstice everyone. Continuing our I guess now semi-official States Series, we’re joined by journalist Devin O’Shea to look at Missouri, the Show-Me State. Ranging from The Bodyguard (1992)-style scandals around the current congressional election, Springfield-like nuclear disasters and tire fires, to the infamous Veiled Prophet ball and its consequences, seedy dealing and nefarious actions abound in the gateway to the west. Would you believe me if I told you there are even “Poppy” Bush and Jet Fighters angles in this one? There are!
Find all of Devin’s work over at: https://linktr.ee/devintoshea
Hosted on Acast. See acast.com/privacy for more information.
Tom Rochemostly EXCELLENT ... excepting closing segment==SE radar on how nicotine bans are world-historical crimes, esp given (by him) that DC is a crime-ridden hellhole filled with cannabis
Krystal and Saagar discuss Nvidea surge exposes possible dotcom bust, Putin North Korea screw you to Biden, Zyn online sales shutdown.
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: https://breakingpoints.com/
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom Rocheconsistently EXCELLENT
Krystal and Saagar discuss CNN blames fake videos for Biden age concern, Hezbollah threatens massive war, Boeing victim mom goes off on CEO, Biden Gaza pier crumbles.
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: https://breakingpoints.com/
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom Rochebog-standard BBC science humor, but competently done, so (moderately) entertaining /and/ informative. Note however that this episode's content does /not/ match the ep note: this one's all botanical, with none of the guests mentioned above.
In this first episode of a new series, ducks’ super vaginas and a meteorite that’s the key to how life on Earth started wow the team.
For this new series of Sue Perkins’ ARIA-winning ‘Show and Tell’ wildlife comedy, Team Nature Table have recorded at the Natural History Museum, Kew Gardens – for some botanical specials – and London Zoo.
Starting the series off, we’re at the Natural History Museum. Sue is joined by special guests: comedian Desiree Burch, science writer Jules Howard and the NHM’s curator of meteorites Dr. Natasha Almeida.
Our varied subjects include: Dogs, a meteorite that can explain how life started on Earth, Ducks’ vaginas (with Sue studying one up close courtesy of a VR headset) and moon rock.
Nature Table has a simple clear brief: to positively celebrate and promote the importance of all our planet’s wonderfully wild flora and fauna in a fun and easily grasped way... whilst at the same time having a giggle.
Hosted by: Sue Perkins Guests: Desiree Burch, Natasha Almeida & Jules Howard Written by: Catherine Brinkworth, Jenny Laville & Jon Hunter Additional material by: Christina Riggs & Pete Tellouche Researcher: Catherine Beazley Executive Producer: Richard Morris Sound Recordist & Editor: Jerry Peal Music by: Ben Mirin Production Coordinator: Sarah Nicholls Producer: Simon Nicholls
An EcoAudio certified production A BBC Studios Audio Production for Radio 4
Tom Rocheconsistently EXCELLENT KB+EJ not-quite-girl-show due to closing-segment interview with Glenn Greenwald on yet another US-deepstate disinformation black-op ... providing yet another reason /NOT/ to refer to 'intelligence' and the 'intel community' but instead to call them what they are, which is COVDISS, because what they actually /do/ is
- covert violence
- disinformation
- subversion
- surveillance
Krystal and Emily discuss Bibi attacking Biden over weapons shipments, Hezbollah drops insane combat footage, Trump punishes DeSantis ally in key House election, Carville says to bet money Trump will ditch first debate with Biden, Boeing plane catches fire as CEO grilled at Congress, Glenn Greenwald details Pentagon anti-China vax psyop.
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: https://breakingpoints.com/
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom Roche/mostly/ EXCELLENT KB+SE, esp ending 2 segments
* how CNN (esp Dana Bash) pushes hasbara lies regarding Oct 7 esp Hamas weaponizing mass rape
* Matt Stoller interview comparing Trump economic rhetoric 2016-2024. Net: Trump has deleted ~all criticism of US big business esp Wall Street, which now loves Trump, and has switched its campaign spending from pro-Hillary and pro-Biden-2020 to pro-Trump 2024
but this episode is marred by yet another overlong KB-SE immigration debate (most of overlong 3rd segment on new US polls showing mass support for mass deportation)
Krystal and Saagar discuss Biden betting on labelling Trump a criminal, Hillary floated as Kamala replacement, mass deportation popular in US, Biden Trump debate preview, cartoonish New Jersey corruption scandal, report shows Israel warned about Oct 7 weeks before, CNN pushes Oct 7 lies, Wells Fargo loses big on rent payment bilt, Trump stops attacking big business.
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: https://breakingpoints.com/
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom RocheVERY EXCELLENT as usual
Tom RocheFINAL Adams-Tingle "mingle," as Phillip introduces incoming replacement LNL host David Marr. (IIUC, Adams' final LNL is to be H 27 Jun 2024.)
China has its eye on Australia's critical minerals which will be a key focus of Premier Li's visit to Australia. Both countries are choosing not to emphasise issues that could strain the relationship, in favour of advancing their respective economic interests. Meanwhile the Teals are in focus as a redistribution means Kylea Tink will lose her seat, while Climate 200 announce their intention to target nine other Coalition seats at the next election.
And Phillip talks to David Marr about becoming the new host of Late Night Live.
Guest: Laura Tingle, Chief Political Correspondent, 7.30
Tom Rochea simple way to create/run multiple, dedicated Emacs instances
The more you move into Emacs, the happier you may become. But at the same time, Emacs is not a real shell, but a text editor. This means there is no real way to manage functionality similarly one would manage applications. It’s all a buffer - the file you opened, each IRC channel, email list, and so on. There are ways to manage it, like dedicated “workspace” plugins1 or simple tabs. But all those don’t fit my mental model. I am “Editing a file” or “chatting” or “writing a web page”. Those are separate concerns, so I want to have dedicated spaces for them.
At the same time I want them in Emacs, as it gives me a unified interface. I don’t need to think how to change IRC channel, how to spell check, or how to actually write in my selected keybindings.
This led me to use multiple, dedicated Emacs instances. This way, I’ve a got a dedicated IRC client, Code editor, Notepad, Email client, and so on. I have unified interface, but at the same time it’s still akin to dedicated programs.
This has the added benefit of fault protection. Tramp session hanging entire Emacs doesn’t disconnect me from IRC, as those are separate processes.
Therefore, I have functions which I call ultimate modes2 to configure Emacs for given use case.
A simple ultimate mode for IRC would look like:
(defun mms-irc-mode()
"use this instance of Emacs for IRC"
(interactive)
(load-theme 'ef-bio)
(erc-tls :server "irc.tilde.chat" :port "6697"
:nick "mms" :full-name "https://michal.sapka.me")
(erc-tls :server "irc.libera.chat" :port "6697"
:nick "mms" :full-name "https://michal.sapka.me")
)
This simple function:
ERC is configured elsewhere, so all auto-joins are there, just redacted, but nothing limits the number of things the ultimate mode setup up. Want to defer loading of bigger package? Want to reconfigure Ispell language? Or maybe you want to load parts of Emacs configurations only when they make sense? Shy is the limit!
Now, I can either run Emacs and call mms-irc-mode or have a dedicated OS level key binding to run Emacs in this mode via:
emacs --eval='(mms-irc-mode)'
This method could easily be expanded to run dedicated emacs servers and connected clients, but I wanted a simpler way.
Like perspective.el ↩︎
Yes, it breaks the musical theory naming scheme.
I could have used “tonic” there to run the erc and pla play with the wordplay, but I decided against it.
Dammit Jim, I’m an engineer, not a musician!
Also, diatonic modes don’t fit the “larger than major” mode. ↩︎
Reply via email
Tom Rochea TDD tool for Guile (which, IIRC, is a Scheme-like Lisp which GNU recommends for extensions, and which can be compiled into elisp)
I practice Test Driven Development almost systematically when I write code. So executing tests and reading their results are more than repetitive tasks.
Repetition could lead to automation... Here I present the first features of a tool that should make my life easier. I call it Gunit64!
This article is valid for the following versions: – guile-gunit64:
0.0.1-0.094c17a– geiser-gunit64:0.0.1-0.7a87357
Given the following SRFI-64 test suite.
The key binding C-c r t will execute these tests and display the result.
The key binding C-c r f will only execute tests that failed during the last execution.
The key binding C-c r . will execute the test at point (the cursor must be somewhere on the string representing the test name).
The key binding C-c r r will re-execute the tests from the last execution.
The geiser-gunit minor mode key bindings will call Emacs Lisp functions which will :
– save all buffers
– compile the current buffer
– evaluate an s-exp in the REPL
This s-exp is one of the procedures exported by the Guile modile gunit64.
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
Unbound variable: run-root-tests
You're missing (use-modules (gunit64)).
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
Wrong type to apply: ""
Your tests are not correctly passed to the *test-root* parameter. Make sure you respect the following model:
(*test-root*
(lambda ()
;;; your tests here))
geiser-gunit64-mode when geiser-mode is enabled (via a hook in your Emacs configuration).*Geiser Debug* buffer processes ANSI colors (setq geiser-debug-treat-ansi-colors 'colors).*Geiser Debug* buffer on compile-time error (setq geiser-debug-jump-to-debug nil).For steps 1 and 2, I created the Guix definitions for these 2 packages. You can find them in my personal channel.
Gunit64 only handles simple test suites (test-assert, test-equal and test-error). As soon as test-group is introduced, things get messy. I haven't yet seen how it behaves with user-defined test-runner (I guess, not very well).
Thank you very much for reading this article! Hope you learned something!
Don't hesitate to give me your opinion, suggest an idea for improvement, report an error, or ask a question ! I would be so glad to discuss about the topic covered here with you ! You can reach me here.
Don't miss out on the next ones ! You can subscribe via RSS or via e-mail just right here !
And more importantly, share this blog and tell your friends why they should read this post!
Tom RocheKB+SE consistently EXCELLENT (in both parts of 17 Jun BP) esp regarding
* US military warning that Houthis are competent military threat
* US bipartisan-deepstate crackdown on anti-Zionist discourse and protest
Krystal and Saagar discuss Israel uses medieval weapon as Hezbollah tensions escalate, US warns on Houthi war failures, Briahna Joy Gray reveals The Hill censorship.
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: https://breakingpoints.com/
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom Rocheconsistently EXCELLENT
Krystal and Saagar discuss MSNBC cope after Biden old man moments, Trump wins if high turnout in November, Macronism dead as French snap election backfires.
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: https://breakingpoints.com/
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom RocheCiarán+Uma give mostly excellent review of the 9 Jun 2024 EU elections, and survey of European politics with a particular focus on 'freaks! freaks! freaks!' ... excepting for a /massive/ misreading of the NATO-EU proxy war on Russia, Ukraine's role in that war, and "left" opposition (esp Wagenknecht) to US vassalage.
Uma and Ciarán play along and pretend the EU is one country and talk the results of the EU, also including some freaks
HOW TO SUPPORT US:
https://www.patreon.com/cornerspaeti
HOW TO REACH US:
Corner Späti https://twitter.com/cornerspaeti
Instagram https://www.instagram.com/cornerspaeti/
Julia https://twitter.com/KMarxiana
Rob https://twitter.com/leninkraft
Nick
Uma https://twitter.com/umawrnkl
Ciarán https://twitter.com/Ciaranxo
Tom Roche"truly Grim" performance--RG's defense of mass migration is astonishingly poor, even for this indefensible policy
Ryan debates Oren Cass, the Executive Director of the American Compass, on Immigration, Biden, and the economy.
Oren Cass: https://x.com/oren_cass
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: www.breakingpoints.com
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom RochePart 2 of 2 (audio @ https://api.substack.com/feed/podcast/145450314/9b67fa028cee96b6e11ccd3c49cc07bb.mp3) not quite as good as part 1 of this Chomsky interview (not /covering/ so much as /lightly touching over/ c1950-2022) but still very worth 40 min of your time
In light of recent health news about Noam Chomsky, we wanted to re-release Danny and Derek’s discussion with him from 2022.
Danny and Derek sit down with linguist and antiwar critic Noam Chomsky to discuss his biography and a bunch of other subjects, from the responsibility of intellectuals to the antiwar movement to what to do in our present situation. And Chomsky disagrees with Danny. This is the second of two parts.
Tom Rochesome interesting bits sprinkled amidst waaay too much culture-war-on-populism of the sort that in the US is associated with the Corporate Democrats (and maybe New Labour in the UK?) (and I've no idea what the Oz equivalent is)
In his new book, George Monbiot says the trend towards neoliberalism began in the 1930s, and has so dominated the political narrative that its now seen as the natural way of things. So as the far-right once again marches to power, is this moment a political tipping point in the direction of fascism? And can this be reversed before the planet reaches its own ecological tipping point?
Guardian columnist and author, George Monbiot. His new book The Invisible Doctrine: The Secret History of Neoliberalism (& How It Came to Control Your Life) is co-authored with filmmaker Peter Hutchison and published by Penguin Australia.
Tom RocheVERY EXCELLENT
It's now 30 years since the Rwandan genocide that saw almost one million citizens die in just 100 days in likely the fastest genocide in history. Soon Rwandans return to the polls where it's almost guaranteed that President Paul Kagame, the leader now for 20 years, will be re-elected.
Despite a dire human rights record and the assassination of perceived critics and enemies, at home and abroad, Kagame remains the "global elite's favourite strongman" and continues to be economically propped up by the West.
Guest: Michela Wrong is the author of Do Not Disturb: The Story of a Political Murder and an African Regime Gone Bad
Tom Roche5:16 teaser only
Happy Father’s Day! Patrick Wyman, host of the Tides of History podcast and author of The Verge: Reformation, Renaissance, and Forty Years that Shook the World, returns to the program to talk about the all-important topic of fathers. Since it’s American Prestige, though, the group decided to focus on one of the great dads of history: Philip II of Macedo…
Tom Roche(not much) Chris+Felix+Will+guests, very funny (esp the readings--WSJ on Elon Musk as uncanny-valley sexpest of female employees, WaPo on the trainwreck that is Laura Loomer), mostly just bant
To celebrate Pride Month, we’ve got Hesse and Ben from Seeking Derangements on the show to look at a slew of recent headlines in queer news, some recent moments of straight excellence (like John Fetterman crashing his car into an old lady), and a long and truly depressing story on one Laura Loomer.
Subscribe to Seeking Derangements: https://www.patreon.com/seekingderangements/about?
Get bonus content on PatreonHosted on Acast. See acast.com/privacy for more information.
Tom RocheMovie Mindset excellent as usual
Hosted on Acast. See acast.com/privacy for more information.
Tom RocheEXCELLENT funny and insightful Chris+Will+guest
We talk to Lance Oppenheim, director of Ren Faire, the new docu-series on HBO. Ren Faire looks at the drama behind the scenes of the enormous Texas Renaissance Festival. When capricious 86-year-old owner and founder “King” George Coulam attempts to retire, his underlings, the obsequious & loyal-to-a-fault Jeff and the ambitious & conniving Louie, are pitted against each other in their attempts to gain control of the park. It’s a darkly comedic real-life Shakespeare story, but it also touches on a lot of ideas about work, employment, ownership, power, performance, alienation, and an (unhealthy?) obsession with the past, all in the context of a very particular modern workplace.
All three episodes of Ren Faire are available now to stream on Max (the place for HBO).
Get bonus content on PatreonHosted on Acast. See acast.com/privacy for more information.
Tom Rocheamusing start to new season of News Quiz
Andy Zaltzman quizzes the week's news. Providing all the answers are Ian Smith, Geoff Norcott, Shaparak Khorsandi and Anushka Asthana.
In this first episode of the new series, the panel catches up on all things General Election, Trumped up charges (all 34), and a recently discovered royal kid.
Written by Andy Zaltzman
With additional material by: Christina Riggs, Jade Gebbie, Mike Shephard & Stephen Mawhinney Producer: Sam Holmes Executive Producer: Richard Morris Production Co-ordinator: Sarah Nicholls Sound Editor: Marc Willcox
A BBC Studios Audio Production for Radio 4 An Eco-Audio certified Production
Tom RocheVERY EXCELLENT
Subscribe to Bad Faith on Patreon to instantly unlock our full premium episode library: http://patreon.com/badfaithpodcast
Independent journalist and bête noire of White House press flacks Sam Husseini returns to Bad Faith to break down the Biden administration's spin over who is really responsible for stalling a ceasefire deal that would bring an end to the carnage in Gaza. Husseini reacts to Hasbara from Jake Tapper and analyzes how hostages have been cynically weaponized by pro-Israel actors to generate sympathy for Israel's siege (and oust progressive news hosts), all while the families of hostages have clearly said that they are far from Israel's priority. Husseini also discusses a new UN report out Wednesday that confirms that claims of mass rape on October 7th are completely unsubstantiated, but that Israel likely implemented the "Hannibal directive" against its own citizens and enacted gross abuses -- including sexual assaults -- on Palestinian victims.Subscribe to Bad Faith on YouTube for video of this episode. Find Bad Faith on Twitter (@badfaithpod) and Instagram (@badfaithpod).
Produced by Armand Aviram.
Theme by Nick Thorburn (@nickfromislands).
Tom RocheBessner and (mostly) Davison global week-in-review EXCELLENT as usual
Another Friday, another roundup courtesy of Danny and Derek. This week: in Gaza, Israel carries out a hostage rescue operation, massacring more Palestinian civilians in the process (0:30), while ceasefire talks amble along (10:54); Israel also kills a Hezbollah commander in Lebanon prompting an armed response (14:32); the field is finalized for Iran’s upcoming presidential election (17:41); in Myanmar, rebels advance in Rakhine State (21:21); tensions rise between the DPRK/North Korea and South Korea (24:20); an update on Sudan and the situation in El Fasher (28:44); coalition talks begin in South Africa in the wake of the recent election (30:31); the Right sees wins in European Parliament elections, plus Macron tries a gambit amidst the fallout in France (35:20); the G7 meets and pledges further support for Ukraine (41:26); the US considers expanding its nuclear arsenal (44:14); and a new Pew poll finds that global support for America/Biden is declining (46:03).
Tom RocheEXCELLENT on Chomsky and his world from 1928 birth (and some prehistory) to c1966
In light of recent health news about Noam Chomsky, we wanted to re-release Danny and Derek’s discussion with him from 2022.
Danny and Derek sit down with linguist and antiwar critic Noam Chomsky to discuss his biography and a bunch of other subjects, from the responsibility of intellectuals to the antiwar movement to what to do in our present situation. This is the first of two parts.
Tom Rocheamusing, much better than th 17 May show
Recorded at the Hay Festival 2024. Mordant topical satire from the usual team with voices by Jon Culshaw, Jan Ravens, Duncan Wisbey and Jess Robinson.
With writing from Tom Jamieson, Nev Fountain, Laurence Howarth, Ed Amsden & Tom Coles, Rob Darke, Edward Tew, Sophie Dixon, Sarah Campbell, Cody Dahler, Joe Topping, Rachel Thorne and Christopher Donovan.
Producer: Bill Dare Exec Producer: Richard Morris Production Coordinator: Dan Marchini Sound Designer: Rich Evans
Tom Rocheconsistently EXCELLENT, esp closing interview with PTI now-US-based spokesperson Shabbas Gill on the not-only-US-backed but CorpDem-Biden-Blinken-initiated current military dictatorship in Pakistan
Ryan and Emily discuss Hunter Biden convicted, Alito wife wars with neighbor on pride flag, Biden admin gaslights on Israel ceasefire, feds investigate UAW, Fox caught editing Trump Epstein interview, Pakistan abducts Imran Khan allies.
To become a Breaking Points Premium Member and watch/listen to the show AD FREE, uncut and 1 hour early visit: https://breakingpoints.com/
Merch Store: https://shop.breakingpoints.com/
See omnystudio.com/listener for privacy information.
Tom RocheVERY IMPORTANT guide to an excellent set of Git features exposed by ... Emacs! (via the excellence of Magit)
We all know how to use git commit --amend to fix up the very last commit.
How beautiful would it be to have a command like:
git commit --amend=3
to extend this power to fix up the 3rd to last — or any other past — commit?
Enter git fixup.
Add this alias to your .gitconfig:
[alias]
fixup = "!f() { TARGET=$(git rev-parse $1); git commit --fixup=$TARGET ${@:2} && GIT_SEQUENCE_EDITOR=true git rebase -i --autostash --autosquash $TARGET^; }; f"
Then, use it as follows:
git add .
git fixup <SHA-1>).Some devs are scared by the very notion of rebasing, but in fact a rebase is an embarassingly simple thing: just a series of cherry-picks.
With a tree such as:
* 84831ab (HEAD -> branch) branch 3
* 65b297f branch 2
* 66fe73c branch 1
| * 7208745 (master) five
| * 6f3ab93 four
|/
* 85f4b7e three
* 7011e1f two
* 76ec393 one
rebasing branch on top of master with:
git rebase master
is just equivalent to:
git reset --hard master
git cherry-pick 66fe73c # 1st commit
git cherry-pick 65b297f # 2nd commit
git cherry-pick 84831ab # 3rd commit
Adding the --interactive flag to git rebase lets you fine tune the
series of cherry-picks before their execution.
If instead of the previous:
git rebase master
you run:
git rebase master --interactive
your preferred editor will pop-up, with this content:
pick 66fe73c 1st commit
pick 65b297f 2nd commit
pick 84831ab 3rd commit
This gives you the chance to do all sorts of magic before rebasing, such as
and the like.
In other words, --interactive creates a transient todo-list file, a
little script of commands for Git to execute.
This is the first key to understanding how git fixup works.
The second key revolves around a little known option of the git
rebase command: --autosquash.
As a matter of fact, not only can the user edit the todo-list file,
but Git itself also interprets the commit messages in search of
commands. This is similar to the functionality often used with GitHub
to close an issue by mentioning its number with a special syntax such as
#fixes 42 in a commit message.
Indeed, during an interactive rebase:
If a commit message starts with “squash! “, “fixup! “ or “amend! “, the remainder of the subject line is taken as a commit specifier, which matches a previous commit if it matches the subject line or the hash of that commit.
In order to instruct Git to interpret those commands, you shall use
the (confusingly named) --autosquash option.
So, the trick for fixing up the 3rd to last commit is to add a new commit with a properly forged message mentioning its message:
pick 3732234 fixup! 3rd commit
pick 66fe73c 1st commit
pick 65b297f 2nd commit
pick 84831ab 3rd commit
and then running an interactive rebase with the --autosquash option.
We are almost there. Let’s fine tune this idea. As a matter of fact, you don’t even have to type that message. Just type:
git commit --fixup 84831ab
and Git will diligently copy the 3rd to last commit message, prefixing
it with fixup!.
Now it’s a matter of executing the interactive rebase, with this magic
--autosquash option.
The only outstanding problem is that for this fixup to work, the
rebase must be interactive and this is not what you wished: you don’t
really want to be asked for any input. You prefer having a git fixup
command completing all the necessary tasks without bothering you.
The trick is to use true as the interactive editor.
true is a little tiny program that does nothing, successfully (it
takes 80 lines to do so).
This should give you all the ingredients to interpret the alias.
If you are one of those horrible developers who refuse to copy-paste a
snippet of code before they really understand it, here’s a breakdown.
| Part | Meaning |
|---|---|
!f() { ... }; f |
Define a shell function named f; at the end, execute it. |
TARGET=$(git rev-parse $1); |
Get the full commit hash of the target commit, specified in the first Bash argument ($1). |
git commit --fixup=$TARGET |
Create a new commit setting the commit message to fixup! <commit message of the target commit>. |
${@:2} |
Optionally, allows you to pass additional arguments to commit. ${@:2} in Bash refers to all the command line arguments starting from the second one. |
&& |
This is a shell operator that executes the next command only if the previous one succeeded. |
GIT_SEQUENCE_EDITOR=true |
Tell Git to use true as the dummy editor for the interactive rebase. true always succeedes, actually turning the interactive rebase as non-interactive |
git rebase |
Start the rebase… |
-i |
interactively… |
--autostash |
stashing any uncommitted changes before rebasing… |
--autosquash |
squashing the fixup commit into the target commit… |
$TARGET^; |
from the commit before (^) the target commit ($TARGET). |
Magit, the amazing Git client running on top of
Emacs, offers a very convenient way for selecting the past
commit to modify. Just make your change. Then, instead of committing on
top of the last commit, run magit-commit-instant-fixup and select
the commit you want to amend. That simple.
The feeling is like having a non-read-only Git history. So sweet!
If this is not enough, Magit offers a command called
magit-rebase-edit-commit that lets you mark a past commit as
editable and perform whatever change you desire.
Yes, Magit is magic. But, of course, under the hood, there’s nothing but a simple, fixup rebase.
Enjoy rewriting history!