In a previous video, we learned how to use DiffMerge as a git difftool and git mergetool. As I was creating that video, I noticed a bug in the program that crashed DiffMerge when attempting to change the font-size. This bug has not yet been fixed by DiffMerge; however, there is a workaround.
All we need to do in open the preferences from the terminal and change the font-size manually.
In this video, we will learn how to setup a git difftool and a git mergetool. These tools provide a nice GUI interface for viewing and modifying diffs and merges.
The tool we will be using in this tutorial is called DiffMerge:
https://sourcegear.com/diffmerge/
If you struggle reading or comparing diffs and merges within your terminal, then a good GUI tool can definitely make your life easier.
In this video, we will take a look at the git stash command. Git stash is extremely useful when you have some changes that you want to save but aren’t ready to make a commit.
There are many different scenarios where knowing how to use stash properly will make your life with git much easier.