Tag: git

Git: Setup Beyond Compare as Difftool and Mergetool

Change config file

Depending on your Git setup (mines Git for Windows). You’ll need to locate your .gitconfig file (mine’s %userpath%/.gitconfig and make the necessary changes below.

Note that the “prompt = false” stops the Y/N prompt for each difftool file compare in the set. Can also be added as git config –global –add difftool.prompt false read more

Continue reading

Git, Docker and CR/LF world of pain.

Docker

As part of a project myself and a colleague were about to commence work on he’d created a docker image of a lightweight Linux image serving SFTP endpoints to replicate the Dev eco system. It was working like a dream. We were setting up and tearing down the containers happily until we checked out the docker files on my machine and that’s where the fun started…..

read more

Continue reading