#rebase

[fxr-mlx]

Increíble carrera de Pato ayer, muy cerca de ser P1 pero ya vendrá 🧡 🇲🇽

[average-desk-lamp]

ma'am sorry. your robot girl backed up her memories, hit her head, forgot stuff, and immediately backed up their memories again. the surgeon is helping her git rebase but you should be prepared for the worst (sorting every file manually)

[tess-or-no]

I would be such a good RiverClan cat: I love soft bedding, collecting pretty trinkets, swimming, sunbathing, eating seafood, being the best looking in a room full of people, etc.. I’d fit right in.

[hagbrigade]

i love sushi and creating a new branch bc a rebase fucked my old one

[exeggcute]

okay I knoooooow there are benefits to working in a monorepo or else no one would do it, but. I just had the scariest git moment of my career where I was trying to fix a merge conflict in a PR and rebase wasn't working for some reason so I followed github's little instructions (bad idea) and ended up doing like a merge merge into my feature branch that pulled in changes from basically every folder in our repo. which means literally every single person in our codeowners file got pinged. I'm mortified

[astralidolator]

My play for when Old World comes out is to loudly complain about how it ruined AoS in my area so those old dudes at the game store can see how it feels when I go to play my funny rats

[deerestrogen]

do you ever think about killing yourself

[vivektech]

Use Git if: ✅ You need speed and distributed development ✅ You want better branching and merging ✅ You work offline frequently

[vasanthasworld]

Relining And Rebasing Short Essay Question And Answers

[todays-xkcd]

I know having so many base pairs makes rebasing complicated, but you're in Bilateria, so shouldn't you at LEAST be better at using git head?

Lungfish [Explained]

Transcript Under the Cut

[Cueball is standing on the end of a wooden dock looking down at a Lungfish sticking its head out of the water.]

Lungfish: It turns out I've been editing both Copy of Copy of Gene v3(Newest)(2) and Copy of Copy of Gene v3(Final)(2), so now I can't delete either one.Cueball: You have got to stop doing this. Lungfish: It's fine, I'll just buy more storage.

[Caption below comic:] Why Lungfish have such enormous genomes.

[softlypaintedseafoam]

one piece fic recs

because everyone else has fun listing theirs, so i wanna list the fics that changed my brain chemistry. there's some gen fics, ship fics, au fics and i'll be sure to included the ratings for each as well. beware anyone not fully caught up or at certain points in the story, there will be spoilers (but like... we should definitely talk about these recs together...)

gen

light up, light up by taizi (t)

“I have a condition,” Sabo says, sounding, to his own ears, disconcertingly like his father when his father is doing business. It might be that, more than anything, that causes Outlook to consider him thoughtfully. “I’m listening,” the man says. 

where ace is the brother that 'dies' after the gray terminal incident and sabo and luffy are left behind

and i'd know your face if i was drunk and blind and dead by solena2 (t)

Sometimes, Sabo wonders about who he used to be. He gets the chance to find out when he bumps into Fire-Fist Ace at a bar.

TAT the fix-it fic of all time where the brothers of all time get a chance to be with each other once again. this is canon, oda told me so himself

a tall tree, with roots like a newborn by chali (t)

A closer look at the immediate aftermath of Whole Cake Island, because Sanji went through some shit and it was not nearly addressed enough.

a fic where the sasuke sanji retrieval squad learn the full extent of the things sanji experienced in wci. they would have truly crashed out if they knew what all went on

rebase and rebuild by sinelanguage (t)

Sanji’s hands are blown off on Whole Cake Island. Franky builds him prosthetics, but Sanji has a much harder time adjusting to them than anyone expects.

a fic where reiju didn't swap out the cuffs and now sanji has to deal with the consequences featuring phone calls with zeff! as if that makes everything any less angstier

a mercy out of me by merikai (g)

“These,” Sanji replied dully, raising his arms. “Handcuffs.” “Handcuffs,” Luffy repeated.

luffy and sanji having a bonding moment post-wci's events

and then what by grayimperia (t)

Zoro becomes the world’s greatest swordsman and is directionless in more ways than one.

ft frobin post-canon fic where, with his lifelong goal finally achieved, zoro isn't sure what to do with his life next

lionheart by cyan96

Wherein thirteen year old Trafalgar Law and twenty-six year old Rocinante tumble sideways through time-space via the blue desperation of a newly eaten devil fruit, from Minion island to a future distant. Right, unwittingly, onto the submarine deck of a another Law shortly after Doflamingo’s fall.

the rosinante lives fic i was not expecting to come across but the power of dope fanart dropped it in my lap

zosopp

take care of you by strawberrycamel (t)

In which Zoro and Usopp can’t see what’s in front of them.

a zou fic where zoro realizes he can totally use minkship as an exploit to cuddle his crush whenever he wants and usopp panics about it

frobin

how to dance with you by grayimperia (g)

When you meet a girl as super as Nico Robin, you learn to make sacrifices. Or, Franky learns to waltz.

ft. lusan wanting to waltz with robin whenever the opportunity again arises, franky asks sanji to teach him how to waltz. of course, not everything goes to plant

between thoughts and steel by inked_spirits (g)

Nights on the Sunny are long when sleep refuses to come. Robin needs to deal with her memories, Franky gets a chance to show her that some wounds are easier to bear when carried together. Night talks under the starry sky are a perfect cure for insomnia.

post-enies lobby fic centered around franky and robin after the first date of all time

lawzo

seeing a lab about a doc by rollingchibi (e)

This is all Bepo's fault.

ft. lusan college au a/b/o fic with alpha professor law and his omega TA zoro. there are shenanigans and smut, what else does one need?

stages of affection by rollingchibi (e)

Looking at himself in the mirror, at the haunted skeleton that looks back at him, he knows—knows as easily as he knows how to run a wire into someone's heart to remove a blood clot, knows as easily as he knows the list of side effects for a pacemaker, knows as easily as how much of a headache Dr. Crocus gives him by simply breathing near him—that things need to change, that he needs to change.

ft. lusan, usokaya modern au. sugar daddy lawzo fic, send tweet. also, plenty of straw hat misunderstandings and the author also found a way to incorporate luffy and zoro's post-timeskip scars into the story... but at what cost

needling away by rollingchibi (t)

"Sorry—you here for an appointment?" Unfortunately. He should've just gone with Bepo to get coffee.

ft lusan, josaku, past zosan surgeon law wants to get his tattoos touched up... sadly he walks in on the tattoo artists' homies going off about how it's fucked his best friend is dating his ex

luzo

these small hours by maximumqueer

"‘Grief’ is a word Zoro never he thought would associate with his captain, and he feels a bit stupid for that. Of course Luffy would grieve Ace, would probably never stop grieving him. Zoro sure as hell hasn’t stopped grieving Kuina, the promise he made her held tightly between his teeth with every fight, a small empty space in his heart reserved for her."

ft namivivi remember that episode post-wano where the straw hats were worried about vivi and zoro brought up ace? yeah nami gives him a STRONG talking to about the insensitivity of that statement

deadhouse by yamatossenpai (m)

"And then Zoro saw it. The mob rushed through the streets like floodwater, dividing and conquering. The men and women were frenzied; their mouths hung open, their eyes wide and bulging. They tore at each other, or rather, the mob attacked anyone who screamed. The attackers were ravenous, barely human. “If you don’t wanna die,” Luffy whispered, “then we should run.”"

ft frobin, usonami modern zombie au no one asks for but we all secretly think about our faves being in anyway. definitely mind the tags on this one

zosan

warning signs by olgaphobia (t)

*unrequited zosan, endgame lusan zoro's perspective fic where his inability to be vulnerable and refusal to be taken care of leads to him fumbling sanji contrast to luffy who has been open about his feelings from day 1. takes an interesting spin on zoro's absence in wci. imagine fumbling sanji when he was actually romantically interested in you at one point in the story, i would cry

lusan

warning signs by olgaphobia (t)

The cook left, but you weren't the one to bring him back.

ft unrequited zosan, end game lusan zoro's perspective fic where his inability to be vulnerable and refusal to be taken care of leads to him fumbling sanji contrast to luffy who has been open about his feelings from day 1. takes an interesting spin on zoro's absence in wci. imagine fumbling sanji when he was actually romantically interested in you at one point in the story, i would cry

insatiable by codhya (g)

But then Luffy says, join my pirate crew. One look at that blinding smile and those wide, unfathomable eyes made Sanji hear the words for what they were. Be greedy with me. And Sanji, he finds that he is starving.

sanji introspection piece on being selfish and wanting

crack baby by sanjilockhart (t)

Luffy and Sanji's developing relationship and how Sanji felt when Luffy, quite literally, crashed into his life.

pre-timeskip baratie arc fic centered around sanji's perspective of the luffy recruitment process, aka sanji introspection piece on the horrors of being perceived and wanted

anchor by trixree (t)

It is said that dreams are shared between soulmates. Luckily, the Vinsmoke children do not dream. (Except, of course, for the failure.)

soulmate au where soulmates share dreams with moments that truly hit one in the feels with this one

easy as anything, simple as that by trixree (t)

“Luffy? What’s the matter?” “We’re gonna’ have a wedding,” he says incomprehensibly. Which—no. Absolutely not. Haven’t they had enough of weddings, lately? Nami's certainly had enough for a lifetime, thanks. “What are you talking about? What wedding?” she demands as coherently as she can while running on only two-and-a-half hours of sleep. “Mine and Sanji’s,” Luffy declares.

post-wci where hours after getting themselves to safety, luffy and sanji decide to have an impromptu wedding

a fine looking high horse by grayimperia (t)

The epic duel between first mate and captain’s boyfriend, involving pettiness, throw pillows, and a general inability to walk in another’s shoes.

zoro perspective fic where it turns out the new cook is also luffy's boyfriend. as it also turns out, zoro discovers he's not good at sharing

we both unsettled (shadow preachers) by senjuside (m)

Relationships are not easy. Luffy and Sanji are still learning how to sail thought their prides and fears, even after all those years.

post-canon married lusan fic where sanji deals with the drawbacks of a husband who still remains at sea even after retirement

love is a full stomach by b3rry_jam (nr)

Luffy doesn’t understand romance, but he knows he feels happiest when he’s with Sanji.

sweet and pure lusan fluff, 11/10

and if you still want me... by fizzyren (g)

Sanji gets a lil angsty in his head about Luffy after Whole Cake.

luffy being possessive and clingy post-wci my beloved

and i know where to look by mr_crowsnest

“Luffy, I’m cooking—” “It’ll wait!” Luffy interrupted, already pulling Sanji into the middle of the kitchen. “This is important!” Sanji stumbled, his protest dying on his lips as Luffy’s hands found his, their fingers intertwining with surprising care. Luffy’s grin was infectious, his laughter bright and unrestrained, and Sanji couldn’t bring himself to push him away.

fluff fic where luffy and sanji dance in the kitchen

[oldschoolfrp]

A Sassanid war elephant by John Blanche, from "Wargaming with Elephants" by Peter Tickler in Miniature Wargames magazine no 8, 1983. Blanche had been converting and painting miniatures and illustrating for Games Workshop since the 1970s but he didn't become their full time art director until after 1986. Eventually his name became synonymous with his grim-dark "Blanchitsu" style.

I have some old 15mm Sassanid Persians and Late Imperial Romans to touch up and rebase, and it's always useful to have clear painting references like this for the more colorful historic armies.

[trollbite]

Happy Orktober everybody! I rebased this 2023 guy on a square and repainted most of the surfaces. I'm very happy with how much I was able to improve him. I made it just in time to submit to the Orktober 2024 competition by Golden Demon Compendium. Head over to the their website (orktober.co.uk) to see all the killer entries, the gallery is amazing!

[la-chacha-gris]

Everything can be called pornography: problems of definition. S2-02

Pornography is the theater of carnality in which the limits of what is permissible are tested, better than in any other forum. Pornography could be defined as the expression of sex for sex's sake without pretext or justification, in which sex is so prevalent that we can forget the theme, the context, the subplots, and every detail of the story. Pornography is the genre that, in theory, seeks the total abolition of sexual mystery, or at least it allows us to separate it from its moral, social, legal, or religious context.

Photo via @dark--khaos

Todo puede ser llamado pornografía: problemas de definición. T2-02

La pornografía es el teatro de la carnalidad en el que se ponen a prueba, mejor que en ningún otro foro, los límites de lo permisible. La pornografía podría ser definida como la expresión del sexo por el sexo mismo sin pretextos ni justificaciones, en la que el sexo tiene tal predominancia que podemos olvidar el tema, el contexto, las subtramas y todo detalle de la historia. La pornografía es el género que en teoría busca la abolición total del misterio sexual o, por lo menos, es el que permite desprenderlo de su contexto moral, social, legal o religioso.

Pornography can be a faithful, detailed illustration, ready to be used and reproduced, like a cooking recipe. It is also the category that brings together and interweaves elements of sexuality, submission, domination, passion, and pain. Pornography has been defined by the tug-of-war between two opposing forces: on the one hand, the struggle between religious figures, conservatives, political authorities, and, more recently, pro-censorship feminist groups, who want to regulate what can be represented and prohibit anything that goes beyond its limits; and on the other, the irrepressible desire of creators and consumers to create.

La pornografía puede ser la ilustración fidedigna, detallada, lista para ser usada y reproducida, como si fuera una receta de cocina. Asimismo, es la categoría que reúne y entreteje elementos de sexualidad, sumisión, dominio, pasión y dolor. La pornografía se ha definido gracias al estira y afloja de dos fuerzas antagónicas: por un lado la lucha de los religiosos, los conservadores, las autoridades políticas y más recientemente grupos de feministas procensura, que quieren regular lo representable y prohibir aquello que rebase sus límites; y por otro el deseo irrefrenable de los autores y los consumidores de crear.

Pornography is a label applied to an immense variety of objects and representations, regardless of their nature or the effect they may produce on a hypothetical audience. Hence, pornography is considered not for what it is but for what it causes. In fact, we can say that there is no neutral definition of pornography, and any reflection or discussion about it inevitably focuses on whether or not it should be tolerated.

La pornografía es una etiqueta que se aplica a una variedad inmensa de objetos y representaciones, sin importar tanto su naturaleza como el efecto que puedan producir en un público hipotético. De ahí que la pornografía sea considerada no por lo que es sino por lo que causa. De hecho podemos decir que no hay una definición neutra de la pornografía y toda reflexión o discusión sobre ella inevitablemente se centra en si debe o no ser tolerada.

Anything can be called pornographic, both those objects created with the deliberate intention of producing erotic stimuli, and others that can simply be adopted and reconfigured in the imagination to have the same effect. But at the same time, nothing is pornographic until someone acting as a censor determines it as such. Pornography is, therefore, extremely complex and difficult to define. However, there is no doubt that it involves a wide range of expressions capable of producing pleasure almost instantly and in enormous quantities.

Todo puede ser llamado pornográfico, tanto aquellos objetos creados con la intención deliberada de producir estímulos eróticos, como otros que simplemente pueden ser adoptados y reconfigurados en la imaginación para tener el mismo efecto. Pero a la vez nada es pornográfico sino hasta que alguien en el papel de censor lo determina como tal. La pornografía es, por lo tanto, extremadamente compleja y difícil de definir. No obstante, no hay duda de que se trata de un amplio rango de expresiones capaces de producir placer casi instantáneamente y en enormes cantidades.

In the second installment of this second season (hence the title "S2" and the "Chapter 02"), we return to the problem of defining what pornography is, because it doesn't depend so much on exciting the senses or on how explicit it is (art often does that) as on whether the work is branded as bad and condemnable, even legally censurable, with the excuse of emptiness—artistic or intellectual—or sin, depending on the era and society judging it.

The idea to recover and translate this fragment by Naief Yehya came to me yesterday from THIS ask (which is why your feedback is important).

En la segunda entrega de esta segunda temporada (por eso T2ª poner y lo de capítulo 02) volvemos con el problema de definición de lo que es pornografía porque no depende tanto de excitar los sentidos o de lo explícito que muestre (eso ya lo hace el arte muchas veces) como que sea tildada la obra de mala y condenable, incluso censurable legalmente, con la excusa de vacuidad -artística o intelectual- o pecado dependiendo de la época y sociedad que juzga.

La idea para recuperar y traducir este fragmento de Naief Yehya me la da ayer ESTE ask (por eso vuestro feedback es importante)

[serinemisc]

So I came across this recently.

It's funny, because I think I exactly half agree with it. I do rebase-heavy workflows in Git mostly because every single Git client makes merge-based workflows ugly and hard to use. If GitHub simply displayed merges the way it displayed squash-merges, that would eliminate so much of the need for squash-merges.

But I don't think this covers everything. So let me go through every use-case for rebase separately:

git merge --squash

The squash-merge is one of the most popular ways to merge pull requests on GitHub, and it's an abject failure of the Git ecosystem that it's so popular.

When you do a regular merge on a pull request, you are essentially taking a bundle of commits from somewhere else, and putting it on top of your own main branch. It's an extremely linear thing to do.

But if you do that, GitHub's commit log just gets a bunch of commits interspersed throughout, with zero indication where they're from. And the nicer clients, if they do, visualize it as a tree (pronounced "DAG") (pronounced "a huge tangle of curvy lines"):

This pic is from an article telling you to rebase, and, like, sure, rebasing sure is one way to work around a UI that displays your merges as a huge tangle. But Fossil makes a really good point. Why not instead display your merges as, like, not a huge tangle? git log --first-parent does this (and that's clearly an option in that Git UI), but it should be the default everywhere. And even when expanding the "bundle", the bundled commits should still be grouped together, not interspersed with other commits at essentially random.

The other issue is that, when showing the "tangle of commits", the reason it's so tangled is because it's showing the commits in chronological order of when the commits were made. Which is a completely useless sort order, compared to, say, chronological order of when they arrived in the current branch (i.e. grouping the merged-in commits together). This is why GitHub's rebase-merge is also such a popular alternative to merges.

git pull --rebase

Okay, so. Now you've fixed commit log visualization of merged pull requests. But that's not the only use of rebase! Here's another one: if you're working on some code, and constantly keeping it synced with remote, you'll generate tons of merges that are complete useless noise. Unlike a merged PR, these should ideally be hidden completely, or at least nearly-completely.

Anti-rebase people say that these merges serve the functionality of, like, preserving history. You made one commit when the remote was in this state, and another commit when the remote was in that state, and this is sometimes important history to preserve.

I think they are way overestimating how important that history is (judging by how many people use pull-rebase). I'm fine preserving that history if you can declutter the UIs, but it does require your UI to be able to distinguish between "important" merges (of new features from feature branches) and "unimportant" merges (keeping branches in sync with remotes).

The linked post doesn't talk about this problem at all, so I don't know how well Fossil handles this.

git commit --fixup

That leaves the amend/fixup commit. The link does mention that Fossil supports editing past metadata (e.g. commit message). But sometimes you want to edit the actual changes of a commit.

Now, for a sufficiently published commit, this is a bad idea. But if you have a habit of "commit early, commit often", having 50 bugfix commits makes a commit log really cluttered.

I frequently, like, have to weigh stuff like "is it worth cluttering the commit log to fix one typo in one comment?" for old code. And it would really suck to also have to do that for unpublished code, instead of going in with my trusty rebase scalpel.

git that's all I wanted to say

In conclusion. git rebase is a solution to a number of things that could also be viewed as UI problems, and fixed in other, better ways, and Fossil sure sounds like it's fixed some of them. But some of those UI problems are legitimately hard, and I'm not convinced Fossil fixes all of them, and GitHub extremely has not, so I'm gonna keep rebasing.

[clearlightwired]

i finished almost nowhere by @nostalgebraist!

i think i heard someone at some point describe this as "puzzle box literature" and that is probably the most accurate descriptor. rotating this book in my mind was intensely pleasing. you don't usually encounter sci-fi with fully-explained science that feels like a real thing that exists; not shying away at all from explaining how things actually work is one of the things i enjoy/respect most about what nostalgebraist did in this book, because the explanation was certainly no easy task (and the fact that it came out both understandable to me and in a way that caused me to want to learn more about actual physics is big).

the same things that make AN less approachable are also what make it an intensely rewarding experience imo... it's long and complex and easy to lose track of. but if you like understanding things then it is the perfect challenge. i am very glad it's as long as it is, both because i'm not sure you could fit what needed to be told in any shorter of a book and also because it was so enjoyable to read that i did not want it to end. nothing feels like it is in excess, though everything has the wonderful depth of things that could easily fill three such books, if you really looked into them

the multi-format nature of AN is one of the strong points. it is at times a physics lecture, a play, an annotated manuscript, a console log, etc. and all of these really work for it and are deployed in ways that make the reading experience better

(spoilers/specifics, if you have not read almost nowhere go read it now!!! please it's so good!)

i don't know yet, how i feel about the ending. it's almost simple, compared to the rest of the book, and not really precedented by anything that happens up to that point, though i think it ends up working well. i'll have to let that part sit for a while

i adored the characters in this book. i would be hard pressed to pick a favorite. it might be grant, or grant and azad together; what little information we get about what the mooncrash was like, in both the rebased and original version, has some certain quality to it that tugs at my heart. though watching the divergence of the annes and all the people they become is up there too. and of course the glimpses we get into what it feels like for the vances, knowing they are fictional... seeing into what it was like for hector in the crash with his anime figurines and video games... suffice it to say that all the characters are dimensional and the crashes give a lot of insight into them across situations. this is probably one of my favorite parts

this book is also just really funny. the types of people described on stein's rock and their customs. moon's whole deal. the descriptions of sylvie's halo and what it does. grant's continued role as "guy who sits, confused, while people tell him incomprehensible things". it makes the whole story flow

i have a lot of questions, still, but mostly ones that are at their core "i wish there was even more of this great book": e.g. how and why did sylvie make the transition from "grant's dog" to "sylvie"? (maybe this is answered somewhere and i missed it.) i typed out a long list of questions after that one but am realizing that a lot of them are just that this book is very complex and maybe much would become clear if i reread it in the future -- the prompt to reread chapter 15 towards the end of the book surprised me with how much more understandable it was the second time around, and probably lots of other parts would be similar now that i've seen the story from above.

this is a really great book. i will maybe write more at some point but for now i want to think on it. and then maybe read everything else nostalgebraist has ever written