Each time you are working on a bug or a feature, you create a branch for it. Usually, while working in such temporary branches, you make multiply commits without bothering a lot about commit messages and simply comment the changes with something like “work in progress” or just “WIP”. Before merging such branch into master […]
git
Git – Checkout Previous Branch
While working with Git, it’s very common to move back and forth between two branches. If you want to checkout the previous branch you was working on, there is no need to type the name of this branch each time. In this short note i’ll show the easy way to switch between two branches in […]
Git – Diff Between Branches
When you are working with multiple branches in Git, it’s important to be able to compare them and contrast the differences. In this short note i will show how to compare two branches in Git using the git diff command. I will show how to git diff between any two branches, e.g. current branch and […]
Git – Diff Staged and Unstaged Files
While working with Git it is often required to check the changes between different areas. Probably everyone knows the git diff, that shows the changes between the Working Directory and the Staging Area (git diff unstaged). But it is also often needed to shows the changes between the Staging Area and the HEAD (git diff […]
Git – Create New Branch and Checkout – In One Command
Each time you want to commit a bug or a feature, you need to create a branch for it. To create a new branch there is a git branch command. After you have created a branch, you need to switch in this branch using a git checkout command. But it is also possible to create […]
Git – Revert File to Previous Commit
Sometimes it happens that you make some changes to a file but later realize that it was a mistake and these changes have to be discarded. In Git you can revert the changes made to a file if you haven’t committed them yet, as well as you can revert a file to any previous commit. […]
Git – Edit Last Commit Message
If you have suddenly noticed that the last commit message is unclear or contains some incorrect information – don’t worry, as the most resent commit message can be easily changed if you haven’t yet pushed the commit to a remote server To edit the last commit message you have to repeat the git commit command […]
Git – Undo Last Commit
There can be a lot of situations when you may want to undo the last commit in Git, that you haven’t pushed to a remote server yet. For example, you have mistakenly committed the wrong files and want to revert the last local commit but keep the changes you made. Or you may want to […]
Git – Delete Branch (Local or Remote)
Normally, when you start working on some new feature, you create a new branch from the default branch (usually called master) and work inside it. When the work is done – you merge your branch inside master and create a new one to work on the next feature. Regardless of whether you are working with […]
Show Git Branch In Terminal – Command Prompt
When you are working inside a Git repository it is important to realize what is the currently checked out Git branch. You can make it easier to track where you are, by showing the name of the current Git branch in the terminal (command prompt). In the almost any Linux distribution, including Ubuntu and CentOS, […]