Another Linux lie: we have source control

Truth is, you kind of, sort of, do.

When you install git in Windows, you get that demented, half-assed editor/merge tool based on vim, from the 1980s. That absurd, diabolical, savage UI in which you have to memorize 2-3 letter commands for every action. I will help you stop that savage torture, by issuing a few commands.

First of all, download and install WinMerge. Once it is there, you can either add its installation directory to your system PATH variable or use full paths below.

Next, set it up in git (assuming that you are 64-bit, not ancient x86):

git config --global merge.tool winmerge
git config --replace --global mergetool.winmerge.cmd "\"C:\Program Files\WinMerge\WinMergeU.exe\"
git config --global mergetool.prompt false
git config --global mergetool.keepBackup false
git config mergetool.winmerge.trustExitCode true

The last 3 commands are technically optional but they will make your life much more enjoyable. They eliminate the following annoyances courtesy of genius degenerate Linus Torvalds:

1. Remove the prompt for the tool selection.
2. Disable .ORIG files
3. Remove the 'was the merge successful?' prompt.

Enjoy! And remember to spit on a genius degenerate today.

Posted by: LinuxLies at 10:38 AM | No Comments | Add Comment
Post contains 193 words, total size 1 kb.