How to use Git?

I am an engineering student who spends most of his spare time watching TV rather than coding. So basically I have zero experience with any kind of version control system. My understanding is somehow …

Git diff – how to quit the diff listing

How do you quit git diff listing?

There is an marker at the bottom of the screen, and everything I do which appears to quit the diff listing, then shows an marker at the …

Convert local master into a branch in git

I cloned a github repository and made several commits locally. I accidentally made these commits on the master branch when I had intended to make a separate branch for my changes. Is there some way to …

How to undo a git merge, but keep history

Our repository has a master branch, but it seems like one of our colleagues had a master branch with a different history. Yesterday he merged his master into the main master and pushed. So today some …