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
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
You can show changes that have been staged with the –cached flag: $ git diff –cached In more recent versions of git, you can also use the –staged flag (–staged is a synonym for –cached): $ git diff –staged
You’re in the less program, which makes the output of git log scrollable. Type q to exit this screen. Type h to get help. If you don’t want to read the output in a pager and want it to be just printed to the terminal define the environment variable GIT_PAGER to cat or set core.pager … Read more
From the git-diff manpage: git diff [–options] <commit> <commit> [–] [<path>…] For instance, to see the difference for a file “main.c” between now and two commits back, here are three equivalent commands: $ git diff HEAD^^ HEAD main.c $ git diff HEAD^^..HEAD — main.c $ git diff HEAD~2 HEAD — main.c
git diff can show you the difference between two commits: git diff mybranch master — myfile.cs Or, equivalently: git diff mybranch..master — myfile.cs Note you must specify the relative path to the file. So if the file were in the src directory, you’d say src/myfile.cs instead of myfile.cs. Using the latter syntax, if either side … Read more
To see the diff for a particular COMMIT hash, where COMMIT is the hash of the commit: git diff COMMIT~ COMMIT will show you the difference between that COMMIT‘s ancestor and the COMMIT. See the man pages for git diff for details about the command and gitrevisions about the ~ notation and its friends. Alternatively, … Read more
This gives a log of all commits between origin/master and HEAD: git log origin/master..HEAD When HEAD is on the master branch, this gives a log of unpushed commits. Similarly, to view the diff: git diff origin/master..HEAD
To compare the current branch against main branch: $ git diff –name-status main To compare any two branches: $ git diff –name-status firstbranch..yourBranchName There is more options to git diff in the official documentation (and specifically –name-status option).
git diff –name-only SHA1 SHA2 where you only need to include enough of the SHA hash to identify the commits. You can also do, for example git diff –name-only HEAD~10 HEAD~5 to see the differences between the tenth latest commit and the fifth latest (or so).