Your comments

Sure, I am also using Beyond Compare, as stated in the very beginning of my post. My point was that for now I require two software, and I need to update two licenses.


But I get your point, and I believe that you are totally right: Beyond Compare is one of the best compare tool, and SmartGit one of the best Git GUI!

Yes Thomas, I understand.


In my personal experience, I find that many companies are still locked with MS Office (at least old companies here in France) and that the Word and Excel documents are the most commonly used in business that I know of (perhaps with PDF).


PS :

  1. Well, I've also asked for support for Git LFS to handle binary files :) And for Git LFS 2.x to handle Locks !
  2. I am using local (sometimes temporary) Git repositories to handle Word documents when I have to write one, acting as a "save with diff" efficient tool, and when you only deal with one or a few documents it works very efficiently. So no "multi-author" in this use case
  3. Also we do have a local SVN server, but it is not updated anymore, it has no shiny features like Merge Request we use with our local Gitlab, and nobody here wants to reinstall SmartSVN when we install new PC

I've already submitted this Idea a few years ago:

  1. the GUI should at least informs you off the git bisect operation in progress.
  2. the Log could add colors to already tested commits (as to firsts good/bad ones)
  3. the GUI could offer a "Bisect Reset" option to get out of this mode

So, you could add more value to SmartGit by implementing a Clean command as a special Stash containing all untracked/ignored files.


This would be great, and would reduce the risk to loose our work by executing ourselves a dangerous "git clean -fdx" command as I often do.

The following has been written somewhere else but is worth repeating here:


This could be obtained by showing working tree modifications in the Log like a Stash.


This feature would add value to the Log Windows from which I work a lot when rebasing/cherry-picking/merging features

Also:

1. Git LFS is now bundled and installed by default since Git for Windows 2.12.1 (2017/03/21)

2. Git LFS is now working under Windows 10 version 1703 (Creators Update) in the "Bash" Windows Subsystem for Linux (this does not affect SmartGit, but is just a way to say that Git LFS usage can grow)

One important feature I've just discovered: Git LFS File Locking mechanism is totally orthogonal/independent to the "Large File" feature: that is, you can lock any file of the repo (sources, config) not only big binary files stored separatly by LFS server.


This is huge, as it means that you can use Git LFS 2.x to lock files without using LFS for storing file, thus keeping every Git clone "complete".

I like that a lot, it's great when using the Log Window a lot like I do!

And beyond Git LFS 1.x support : Add support for Git LFS 2.0.0 File locking mechanism

Newly released Git LFS 2.0.0 comme with centralized "File locking".

  • For now it is only supported by Github.com, but I expect Gitlab and Bitbucket to follow sooner or latter.
  • It is only working with a centralized repository, that is when sharing a repository in a Github Organization, or when using a dedicated "on premise" server (using Gitlab there).
  1. It would be great to add support for the new "git lfs lock", "git lfs unlock" and "git lfs locks" commands.
  2. This would require at least a new status icon (Lock) but probably two (Lock by other), a row with the name of the user locking the file,

Note that in my experience, the command line is currently a bit confusing (HTTPS seems to work reliably only when basic authentication got through an explicit https://username@gitlhub.com URL).


I can do that (I will do), but please bear in mind that this go beyond the simple "Git LFS 1.x"