Mac merge tool git how to#

Most Git commands such as git add and git commit will throw an error like fatal: not a git repository (or any of the parent directories). This is one of the few Git commands that doesn't even need to be used within an existing Git repo. You can also use git diff to compare one or more files that aren't tracked by Git, or are even outside of the working directory. The git diff can then be used for listing the changes between the commit or branch that introduced the bug and the previously working commit. In the case of a bug in your application, you may run the git bisect command to help identify which commit introduced the bug. What do we mean by two 'things'? Almost anything that you want: working directory, staging tree, HEAD, committed changes, branches, or tagsįurthermore, Git diff is especially useful for fixing bugs. When I merge from somebody, I trust them but on the other hand, hey they might have stopped using their medication, so I trust them but, let's just be honest here, they might have been ok yesterday, but today might not be a good day, so I do diffstat and git does that by default' - Linus Torvalds 'After every merge by default git will do a diffstat of everything that changed as a result of that merge because I do care about that. It provides more detail than git status or git log, and is much more flexible in its applications. Git diff is a command-line tool used to determine the differences between two things, per line or even per character. Let's break it down.Ī basic understanding of Git version control is recommended to get the most out of this article. Additionally, Git diff has many options for comparing data between commits and branches. As you will see, this command is particularly flexible and useful at every stage in the git life cycle.

Mac merge tool git how to#

In this article we will explore the ins and outs of the git diff command and how to use it. But how useful is it when you want to compare two or more versions in a repository? You may have heard that Git is a great way to store version history. How Do I Save a Result From Git Diff and Apply It Later?.