跳至主要内容

Use MobaDiff with git difftool

Recently there's an activity in IT that forces the deletion of all
unauthorized softwares from all work machines.

Unfortunately, kdiff3 is one in the list.

As it is generally okay to use vimdiff as an alternative for kdiff3, A
gui tool is better suited for desktop workflows.

Known that MobaXterm is shipping a gui diff tool named MobaDiff. But
it only appears in the windows right click context menu.

Find the real application name takes me some time to search in the
windows registry. "MobaRTE.exe", which is the one invoked by
HKCR\*\shell\MobaDiff. And it was invoked with "-contextdiff" switch
to show MobaDiff UI, while when the switch is "-contextedit" it shows
MobaTextEditor.

Too bad that the "-contextdiff" switch do not support pre-image
post-image as other diff tool did, which effectively made it unable to
be used as a command line diff utility.

Also MobaTech did not mention anything in their document of this
MobaRTE application.

Finding the correct parameter and switches to invoke it as an ordinary
diff utility takes me lots of time. In the MobaXterm document, it was
said "MobaXterm.exe" will accept the "-compfiles" parameter which will
invoke the MobaDiff interface. But it does not work in my system,
actually MobaXterm.exe when invoked with -compfiles parameter will
hang there showing a splash banner only. I have to use Ctrl-C in the
terminal to stop it.

The good thing is, "MobaRTE" accepts the "-compfiles" switch also, and
it accepts those pre-image and post-image filenames parameters.

Now it works like a diff utility. And here's my setup:

```
git config --global diff.guitool moba
git config --global difftool.moba.cmd '"C:\Program Files
(x86)\Mobatek\MobaXterm\MobaRTE" -compfiles $LOCAL $REMOTE'
```

评论

此博客中的热门博文

Winget: From Quirky Underdog to Stable Champion

Remember winget, the Windows Package Manager that started as a playful experiment? Well, prepare to be surprised – it's grown into a powerful and highly stable tool for managing your software, including in environments with network restrictions . Gone are the days of unreliable installs and limited functionality. The developers have diligently transformed winget into a reliable contender in the package manager arena. Updates arrive regularly, bringing stability, enhanced features, and wider app support . Here's why you should give winget another look: Unified experience: Manage all your apps from a single command line , ditching the scattered hunt for individual installers and downloads. Security focus: Winget verifies package integrity and signatures, ensuring you get authentic and secure software . Efficiency: Say goodbye to manual downloads and updates. Winget automates the process, saving you time and effort. Customization: Configure installation options and choose s...

Eglot and before/after-save-hook and use-package

In Emacs, when you try to automate some actions during every save action, you will surely get to the before-save-hook and the after-save-hook. Simply adding something like gofmt-before-save to before-save-hook will save you tons of time to do the go-fmt. And then, I meet eglot, and gopls will also save me tons of time doing googling and api documentation navigation. But eglot-ensure is not very friendly to the good old ways of how after-save-hooks were designed to work. It makes the before/after-save-hook a buffer local variable and it does not inherit the variable's global value. So, to make before/after-save-hook work again, experts start to adding hooks to major mode specific hooks like this: emacs.md - Go (opensource.google) """ ;; Optional: install eglot-format-buffer as a save hook. ;; The depth of -10 places this before eglot's willSave notification, ;; so that that notification reports the actual contents that will be saved. (defu...