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
By default git diff truncates its output to fit into a 80-column terminal. You can override this by specifying values using the –stat option: –stat[=<width>[,<name-width>[,<count>]]] Generate a diffstat. You can override the default output width for 80-column terminal by –stat=<width>. The width of the filename part can be controlled by giving another width to it … Read more
GitHub suggests that you should make sure to only use \n as a newline character in git-handled repos. There’s an option to auto-convert: $ git config –global core.autocrlf true Of course, this is said to convert crlf to lf, while you want to convert cr to lf. I hope this still works … And then … Read more
As of Git 2.15, git diff now supports detection of moved lines with the –color-moved option. It even detects moves between files. It works, obviously, for colorized terminal output. As far as I can tell, there is no option to indicate moves in plain text patch format, but that makes sense. For default behavior, try … 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
Use one of the following: git show -m c05f017 git show –first-parent c05f017 git diff c05f017^ c05f017 There’s a fundamental error in your question: commits are not diffs; commits are snapshots. This might seem like a distinction without a difference—and for some commits, it is. But for merge commits, it’s not. When git show (or … Read more
Use git log to view the commit history. Each commit has an associated revision specifier that is a hash key (e.g. 14b8d0982044b0c49f7a855e396206ee65c0e787 and b410ad4619d296f9d37f0db3d0ff5b9066838b39). To view the difference between two different commits, use git diff with the first few characters of the revision specifiers of both commits, like so: # diff between commits 14b8… and … Read more
If the problem is “main and master are entirely different commit histories.”, the following will work git checkout master git branch main master -f git checkout main git push origin main -f
Try git diff k73ud^..dj374 to make sure to include all changes of k73ud in the resulting diff. git diff compares two endpoints (instead of a commit range). Since the OP want to see the changes introduced by k73ud, he/she needs to difference between the first parent commit of k73ud: k73ud^ (or k73ud^1 or k73ud~). That … Read more
Copy the diff file to the root of your repository, and then do: git apply yourcoworkers.diff More information about the apply command is available on its man page. By the way: A better way to exchange whole commits by file is the combination of the commands git format-patch on the sender and then git am … Read more