Conversation

Notices

1. Embed this notice
   Julia Evans (b0rk@social.jvns.ca)'s status on Tuesday, 12-Dec-2023 09:03:43 JST Julia Evans

   meet the branch

   • clacke likes this.
   • Embed this notice
     Stacey Campbell (stacey_campbell@aus.social)'s status on Tuesday, 12-Dec-2023 09:03:47 JST Stacey Campbell

     in reply to

     • Michael Lucas :flan_set_fire:

     @mwl @b0rk Same, but my goal is to sneak into retirement still oblivious.

     clacke likes this.
   • Embed this notice
     Michael Lucas :flan_set_fire: (mwl@io.mwl.io)'s status on Tuesday, 12-Dec-2023 09:03:48 JST Michael Lucas :flan_set_fire:

     in reply to

     @b0rk I'm looking forward to this one, because after decades I have no idea how git works.

   • Embed this notice
     enterprisey (enterprisey@wiki.style)'s status on Tuesday, 12-Dec-2023 09:03:51 JST enterprisey

     in reply to

     @b0rk wait, farts! I was thinking of how git diff works. ughhhhhhhhh

     clacke likes this.
   • Embed this notice
     enterprisey (enterprisey@wiki.style)'s status on Tuesday, 12-Dec-2023 09:03:52 JST enterprisey

     in reply to

     @b0rk oh no, I'm misunderstanding something (not uncommon)... I thought to get the two labeled commits in the first diagram it would be a triple-dot diff, because a double-dot diff would give four commits (those two plus the most recent two on main)?

   • Embed this notice
     enterprisey (enterprisey@wiki.style)'s status on Tuesday, 12-Dec-2023 09:03:54 JST enterprisey

     in reply to

     • ✿ Floby 💉😷💨

     @floby @b0rk yeah the only reason I have them straight (or, at least I thought I did! lol) was it broke our CI at work in an entertaining way and I wrote a very salty commit message explaining all this

     clacke likes this.
   • Embed this notice
     ✿ Floby 💉😷💨 (floby@mastodon.social)'s status on Tuesday, 12-Dec-2023 09:03:55 JST ✿ Floby 💉😷💨

     in reply to

     • enterprisey

     @b0rk @enterprisey glad to see I'm not alone on this ^^ I know there are some times two and sometimes three dots but I guess I don't use this frequently enough for it to register

   • Embed this notice
     Julia Evans (b0rk@social.jvns.ca)'s status on Tuesday, 12-Dec-2023 09:03:57 JST Julia Evans

     in reply to

     • enterprisey

     @enterprisey yeah it's the worst, I can never remember which is which

   • Embed this notice
     ✿ Floby 💉😷💨 (floby@mastodon.social)'s status on Tuesday, 12-Dec-2023 09:04:01 JST ✿ Floby 💉😷💨

     in reply to

     • enterprisey

     @enterprisey @b0rk adding salt is good for the security of your git hash

     clacke likes this.