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
Answering myself… In the Git GUI main menu go to Edit -> Options. In Additional Diff Parameters put -w (or –ignore-all-space). In fact, any other git-diff parameter can go there too.
This actually has nothing to do with git diff. git diff actually renders a tab, which is later converted by your terminal emulators (for instance, gnome-terminal) to spaces. Go to the preference of your terminal emulator to change that setting. Also, git may use a pager, so you might want to configure it like that: … Read more
git diff supports comparing files line by line or word by word, and also supports defining what makes a word. Here you can define every non-space character as a word to do the comparison. In this way, it will ignore all spaces including white-spcae, tab, line-break and carrige-return as what you need. To achieve it, … Read more
git diff prints paths (of changed files) from the root of the repo – no matter where you are when executing the command. git diff –relative will print paths from the dir you are in. So if you need paths not starting from the repo-root move down (cd) to the directory (within your repo tree) … 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
I sometimes use Diff Checker tool on the diffchecker website. It is an online diff tool to compare text differences between two text files. Link: https://www.diffchecker.com/diff
Here is a solution that is working well for me. I’ve written up the solution and some additional missing documentation on the git (log|diff) -G<regex> option. It is basically using the same solution as in previous answers, but specifically for comments that start with a * or a #, and sometimes a space before the … Read more
This command will diff their whole history: git diff branch1..branch2 –name-only If you want to compare from their last common ancestor, then: git diff branch1…branch2 –name-only And now you can grep files that you want. From there it’s easy to write a little shell script that diffs two branches, file by file. filenames=$(git diff branch1…branch2 … Read more
git show is your friend: git show shaOfHisCheckIn