diff returning entire file for identical files

This seems like a whitespace issue, in order to avoid them in the future, you can setup Git to normalize them. Windows and UNIX system don’t use same line-ending, to prevent conflict from happening based on these, you should setup you git config this way: Windows : git config –global core.autocrlf true Unix : git …

Read more

Git: cancel an interactive rebase

You can make vim exit with a non-zero exit code to cancel the rebase by typing :cq. The result of this is: $ git rebase -i HEAD~4 # enter vim, then type :cq<enter> Could not execute editor From the vim help page we see that cq is short for cquit: *:cq* *:cquit* :cq[uit][!] Quit Vim …

Read more

Git clone: Redirect stderr to stdout but keep errors being written to stderr

A MingW update provide a new way to handle redirection with Git 2.15.x/2.16 (Q1 2018) See commit b2f5571, commit 1a172e4, commit 3f94442 (01 Nov 2017) by Johannes Schindelin (dscho). (Merged by Junio C Hamano — gitster — in commit 421f21c, 09 Nov 2017) mingw: add experimental feature to redirect standard handles Particularly when calling Git …

Read more