git diff A...B (3 dots) (beginner - intermediate) anthony explains

[@bbug705076]

Great git lessons. really benefit from them

[@mfeickert07]

Thank you! I've known for years that there was a difference, but had never gotten around to looking up exactly what it was. This was super well explained too.

[@npscole]

These are great videos. Thank you for your output.

[@bhaveshverma8629]

This is very useful. Thank you

[@Deepeshp656]

Git diff master...feature give no merge base error when i try to use it in github action

[@anthonywritescode]

it github actions the default cloning strategy is shallow, so it does not have enough history to find a merge base between the two. if you use `fetch-depth: 0` (which is a deep clone) it will have enough commit history to find a common parent

[@خيريخالد-غ2ث]

I hope you are well I have two questions if you can help me about git difference 1) I have two files to difference them, each file has about 960 lines. In case I want to make difference between them but the differences start from line 150 until the end of the files. How can do that using git diff & git difftool ? 2) How can do the auto difference between files then send an automatic email for these differences?

[@anthonywritescode]

for (1) are you asking how to only show differences after line 150? I don't think `diff` has a thing for that but you might be able to slice the file and only compare the parts you care about? for (2) you'd probably build some sort of system (cron?) that runs a task which checks that diff and emails

[@giovannipcarvalho]

hopefully rebase will start supporting triple-dot soon I like to squash/cleanup my commit messages before publishing my branches on the remote. I have to use merge-base before rebasing interactively if I just want to edit my commits without integrating changes that happend after I branched, which usually is the case.

[@anthonywritescode]

I just use `git rebase -i $committoedit^` which work well enough for me!

[@giovannipcarvalho]

@@anthonywritescode yeah that’s fine too, but I have a function to do it without having to look up which commit is the merge base! :D

[@anthonywritescode]

nah I don't look up the merge base -- just the commit I want to change

[@giovannipcarvalho]

@@anthonywritescode oh, I do this when I’m ready to get reviewed and want to squash dozens of commits into a single one before pushing my branch to the remote!

[@bhaveshverma8629]

Awesome