This will do the +/- rather than < and >. diff -u file1 file2 Since GNU diffutils 3.4 the flag –color has been added. Combining both makes the following: diff –color -u file1 file2 The flag –color also takes an argument, valid options are never, always, or auto. Useful when you want to be more … Read more
git diff branch1:full/path/to/foo.txt branch2:full/path/to/foo-another.txt You can also use relative paths: git diff branch1:./relative/path/to/foo.txt branch2:./relative/path/to/foo-another.txt
The –diff-filter option works with both diff and log. I use –diff-filter=M a lot which restricts diff outputs to only content modifications. To detect renames and copies and use these in the diff output, you can use -M and -C respectively, together with the R and C options to –diff-filter.
The best way to do this is by running the command: git diff –name-only –cached When you check the manual you will likely find the following: –name-only Show only names of changed files. And on the example part of the manual: git diff –cached Changes between the index and your current HEAD. Combined together, you … Read more
Try git difftool Use git difftool instead of git diff. You’ll never go back. UPDATE to add an example usage: Here is a link to another stackoverflow that talks about git difftool: How do I view ‘git diff’ output with my preferred diff tool/ viewer? For newer versions of git, the difftool command supports many … Read more
If [remote-path] and [local-path] are the same, you can do $ git fetch origin master $ git diff origin/master — [local-path] Note 1: The second command above will compare against the locally stored remote tracking branch. The fetch command is required to update the remote tracking branch to be in sync with the contents of … Read more
Since I’d already created these images, I thought it might be worth using them in another answer, although the description of the difference between .. (dot-dot) and … (dot-dot-dot) is essentially the same as in manojlds’s answer. The command git diff typically¹ only shows you the difference between the states of the tree between exactly … Read more
You can just use git diff to produce a unified diff suitable for git apply: git diff tag1..tag2 > mypatch.patch You can then apply the resulting patch with: git apply mypatch.patch
In repo_a: git remote add -f b path/to/repo_b.git git remote update git diff master remotes/b/master git remote rm b
git diff `git merge-base master branch`..branch Merge base is the point where branch diverged from master. Git diff supports a special syntax for this: git diff master…branch You must not swap the sides because then you would get the other branch. You want to know what changed in branch since it diverged from master, not … Read more