Category: Git

Learn how to use git rebase -i to reorder, combine, rename, and delete commits before integrating your work. Take full control of your history, commit by commit.

Learn what rebase is in Git, when to use it instead of merge, how to resolve conflicts during the process, and the golden rule you must never break.

Learn to send and receive changes in Git with git push and git fetch. Understand the difference between fetch and pull, how to use --force-with-lease, and why git push --force is a bad idea.

Learn to manage Git remotes: add, remove, rename, and inspect them with git remote. Understand tracking branches and how to work with multiple remotes.

Need to switch branches urgently but have unfinished changes? Git stash is your lifesaver. Learn how to temporarily save your work and recover it whenever you need it.

Master Git branches: fast-forward merges, merge strategies, branch management with git branch and git switch, and how to recover from a detached HEAD state.

Before making a commit, do you know exactly what you've changed? git diff shows you line by line what was modified, what is staged, and what differs between branches.

Not every file in your project should be in Git. Learn how to use .gitignore to exclude what shouldn't be versioned and how to configure a global .gitignore for your machine.

Two commands you'll use every single day with Git: git status tells you the current state of your repository and git log shows you its history. In this tutorial we study both in depth.

Discover the most useful Oh My ZSH! aliases for working with Git. Learn how to speed up your commands and increase your productivity.