Near 11:50 I typed the arguments backwards, I should have typed 'git diff origin/integration_branch...origin/topic_branch' when explaining how the triple dot notation reflects the "changes" tab in gitlab merge requests.
@aram56423 жыл бұрын
But does this matter? I usually type 'git diff develop...' to see how I compare to merge-base. So the integration branch is the only one I actually type.
@aram56423 жыл бұрын
This is the single, unlimate answer that one should ever need to understand Git's double vs triple dot idiosyncrasy. I think I will use the screenshot as my wallpaper. Thanks a million for this vid!
@DanGitschooldude3 жыл бұрын
Lol I have referenced this video myself many times at work so I can remember which is which. Thanks for watching!
@aram56423 жыл бұрын
@@DanGitschooldude Thanks for explaining! Then there is identity where git diff A..B = git diff A...B + git diff B...A (reversed for git log).
@takshpatel81098 ай бұрын
Thanks Dan
@aram56423 жыл бұрын
In case you'd ever feel tempted to update the series, I would love to hear about the practical use of bare repos.
@prafulkumar10674 жыл бұрын
Being a beginner in version control system, this video was really helpful. In my field lots of collaboration is there and we often have to do rebasing & squashing of commits. It's better to know what changes we are contributing from our feature branch to our integration (default) branch. Thanks.
@loganplumlee38403 жыл бұрын
The git diff double dot and triple dot seems to be counter intuitive. So a triple dot would show everything from the merge point to B (3 commits) and a a double dot would take into account the commits on A, so it would technically be showing the effect of 5 commits?