Post #2175370
2023-12-11 17:06 UTC
Replies (14)
-
@brainofdane@hachyderm.io 2023-12-11 17:09
@b0rk@social.jvns.ca this has already taught me some new things about git. So good!
-
@mwl@io.mwl.io 2023-12-11 17:14
@b0rk@social.jvns.ca I'm looking forward to this one, because after decades I have no idea how git works.
-
@enterprisey@wiki.style 2023-12-11 17:17
@b0rk@social.jvns.ca 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)?
-
@furicle@mastodon.social 2023-12-11 17:26
@b0rk@social.jvns.ca Does that mean they should be called 'paths' not 'branches' ? I guess path gets confused with file path...
-
@encukou@mastodon.social 2023-12-11 17:39
@b0rk@social.jvns.ca This makes the third way look like an internal detail, but to me, "current state of the branch" is useful. `git show BRANCHNAME` or a GitHub .../BRANCHNAME/FILENAME URL look at a branch this way.
-
@slyecho@mdon.ee 2023-12-11 18:17
@b0rk@social.jvns.ca yeah, it makes sense.
-
@skamille@mastodon.social 2023-12-11 18:28
@b0rk@social.jvns.ca you are so great at explaining things
-
@zellyn@hachyderm.io 2023-12-11 18:53
@b0rk@social.jvns.ca Slightly trolling but alas, not really…
-
@gnomon@mastodon.social 2023-12-11 19:28
@b0rk@social.jvns.ca this is going to be very useful at $JOB, thank you. In contrast to how git works, I really appreciate Fossil's approach¹: although Fossil's internal storage model is git-compatible², branches-as-sequences-of-commits are first-class objects and can be meaningfully queried, e.g. "what commits come after commit XYZZY?" has O(1) time cost rather than O(n) in the number of refs in the repo. You can attach a wiki page to a branch! ¹: https://fossil-scm.org/home/doc/trunk/www/branching.wiki#tags ²: https://fossil-scm.org/home/doc/trunk/www/inout.wiki
-
@ShadSterling@mastodon.social 2023-12-11 20:02
@b0rk@social.jvns.ca ooh, I want something like this for HEAD. Does a branch have a HEAD? Is that a two-HEAD-ed repo? How did my HEAD get detached?
-
@unsaturated@discuss.systems 2023-12-11 21:04
@b0rk@social.jvns.ca do you have any material on fast-forward? I get a bunch of questions about that every time I do my “git talk” at work
-
@avi@flaximus.net 2023-12-11 22:54
@b0rk@social.jvns.ca this is great!
-
@snorerot13@mstdn.social 2023-12-12 01:19
@b0rk@social.jvns.ca I am so looking forward to this zine
-
@jnareb@fosstodon.org 2023-12-14 01:02
@b0rk@social.jvns.ca Note that you can examine branch reflog to find where branch was forked from (1st image), or tell Git to examine it for you with `git rebase --fork-point`