Embed Notice

HTML Code

<blockquote style="position: relative; padding-left: 55px;"><section><a href="https://social.jvns.ca/users/b0rk/statuses/111562876494436046">Julia Evans (b0rk@social.jvns.ca)'s status on Tuesday, 12-Dec-2023 09:03:43 JST</a><a href="https://social.jvns.ca/@b0rk" title="b0rk@social.jvns.ca"><img src="https://gnusocial.jp/avatar/88850-48-20230116234922.webp" width="48" height="48" alt="Julia Evans" style="position: absolute; left: 0; top: 0;">Julia Evans</a></section><article><p>meet the branch</p></article><footer><a rel="bookmark" href="https://gnusocial.jp/conversation/2441632#notice-4828696">In conversation</a><time datetime="2023-12-12T09:03:43+09:00" title="Tuesday, 12-Dec-2023 09:03:43 JST">about a year ago</time> <span>from <span><a href="https://social.jvns.ca/@b0rk/111562876494436046" rel="external" title="Sent from social.jvns.ca via ActivityPub">social.jvns.ca</a></span></span><a href="https://social.jvns.ca/@b0rk/111562876494436046">permalink</a><h4>Attachments</h4><ol><li><label><a rel="external" href="https://gnusocial.jp/attachment/1952365">You can think about a Git branch in 3 different ways. way 1: just the commits that "branch" offThis is what you're probably thinking about when you `merge` or `rebase` a branch into another one.Git doesn't keep track of which branch another branch is "based" on though: that's why you have to run git merge main (you have to tell it which base branch to merge with!)You can see these commits with:git log main..BRANCHNAMEway 2: every previous commitThis is what git log BRANCHNAME shows you.When we say a commit is "on" a branch, we mean that it's somewhere in the history for that branch.way 3: just the commit at the endThis is how git represents a branch internally. You can run:cat .git/refs/heads/BRANCHNAMEto see the commit ID for the branch.That commit's parent (and grandparents, great-grandparents, etc) determine the branch's history.</a></label><br><a href="https://cdn.masto.host/socialjvnsca/media_attachments/files/111/562/876/113/788/292/original/c491bdc79f22082a.png" rel="external">https://cdn.masto.host/socialjvnsca/media_attachments/files/111/562/876/113/788/292/original/c491bdc79f22082a.png</a></li></ol></footer></blockquote>

Corresponding Notice

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
In conversationabout a year ago from social.jvns.capermalink
Attachments
1. You can think about a Git branch in 3 different ways. way 1: just the commits that "branch" off This is what you're probably thinking about when you `merge` or `rebase` a branch into another one. Git doesn't keep track of which branch another branch is "based" on though: that's why you have to run git merge main (you have to tell it which base branch to merge with!) You can see these commits with: git log main..BRANCHNAME way 2: every previous commit This is what git log BRANCHNAME shows you. When we say a commit is "on" a branch, we mean that it's somewhere in the history for that branch. way 3: just the commit at the end This is how git represents a branch internally. You can run: cat .git/refs/heads/BRANCHNAME to see the commit ID for the branch. That commit's parent (and grandparents, great-grandparents, etc) determine the branch's history.
  https://cdn.masto.host/socialjvnsca/media_attachments/files/111/562/876/113/788/292/original/c491bdc79f22082a.png

Public

Embed Notice

HTML Code

Corresponding Notice