←back to thread

Beej's Guide to Git

(beej.us)
1062 points mixto | 1 comments | 05 Feb 25 00:07 UTC | HN request time: 0s | source
Show context
beej71 ◴[05 Feb 25 02:03 UTC] No.42942594[source]▶
Hey all--if you find things wrong, post 'em. I'll clean 'em up. :)

Love, Beej

replies(30): >>42942620 #>>42942694 #>>42942736 #>>42943486 #>>42943604 #>>42944525 #>>42945585 #>>42945722 #>>42946123 #>>42946210 #>>42946648 #>>42946913 #>>42947174 #>>42947352 #>>42947971 #>>42948270 #>>42948388 #>>42948408 #>>42949187 #>>42949195 #>>42949987 #>>42950982 #>>42952060 #>>42953388 #>>42953692 #>>42955126 #>>42959191 #>>42961534 #>>42974297 #>>42978137 #
defanor ◴[05 Feb 25 21:06 UTC] No.42955126[source]▶
In section 5.7:

> But in this section we’re going to be talking about a specific kind of merge: the fast-forward. This occurs when the branch you’re merging from is a direct ancestor of the branch you’re merging into.

Looks like "from" and "into" are swapped: "main" is "into" there, "newbranch" is "from", and "main" is a direct ancestor of "newbranch".

replies(1): >>42967180 #
1. beej71 ◴[06 Feb 25 22:32 UTC] No.42967180[source]▶
D'oh! Fixed.