Conversation

Notices

1. Embed this notice
   Ryan Castellucci :nonbinary_flag: (ryanc@infosec.exchange)'s status on Thursday, 13-Feb-2025 23:35:39 JST Ryan Castellucci :nonbinary_flag:

   Haha git diff <other branch> | patch -Rp1 go brrrr!

   • Embed this notice
     Ryan Castellucci :nonbinary_flag: (ryanc@infosec.exchange)'s status on Thursday, 13-Feb-2025 23:43:01 JST Ryan Castellucci :nonbinary_flag:

     in reply to

     This shitpost brought to you by whyever the hell my attempts to rebase failed.

   • Embed this notice
     Ryan Castellucci :nonbinary_flag: (ryanc@infosec.exchange)'s status on Thursday, 13-Feb-2025 23:43:52 JST Ryan Castellucci :nonbinary_flag:

     in reply to

     • Joacim Jacobsson

     @jjacobsson Patches the current branch to match the other branch, for when rebase doesn't work and you're tired of git's bullshit.

   • Embed this notice
     Joacim Jacobsson (jjacobsson@mastodon.gamedev.place)'s status on Thursday, 13-Feb-2025 23:43:53 JST Joacim Jacobsson

     in reply to

     @ryanc ... does this just... .. what? what does this do? Creates a patch that removes all the differences?