I also tried changing "bundled" to "system" and even "wsl git", but that did not work. I'd guess that is confusing the "bundled" git that Sublime Merge is using. It appears that all of the false positives have the executable bit set within WSL2. I will have to stop using Sublime Merge until I can figure out a solution. I have tinkered with whitespace diff settings, but have not been able to resolve this. Sublime Merge has no time limit, no metrics, and with no tracking done on. The result is a Git client with a better and familiar interface. Called Sublime Merge, this tool combines the user interface of Sublime Text, with a from-scratch implementation of Git. Yesterday, when I upgraded from build 2074 to build 2077 a new quirk was introduced that makes this workflow untenable because there are ~150 false positive "pending changes" that display in the summary view despite there being zero changes to display. The makers of Sublime Text have released a new Git client yesterday. ctrl shift h is useful to update Sublime Merge with the latest changes, since automatic updating doesn't work. This will remove sublime merge integration, while preserving general git support. Sometimes you need to see more context around a change in order to understand it. Changes are shown in a condensed view by default, similar to git diff. I can quickly look at the changes I have pending and then go back to the command line to write commits. Starting with sublime 4 build 4121 we can now just set: 'sublimemergepath': null. Reviewing changes is easy in Sublime Merge. In the 'Commits' view ( Ctrl 2 by default), right-click on the latest commit of the branch you want to rebase onto ( origin/master ). This setup has been working nicely for a "read only" view of the repository. Here is how to replicate the command git rebase origin/master mine in Sublime Merge: Check out the branch you want to rebase ( mine ). This is accomplished by using GPG which is a free encryption and signing tool. By signing your commit you’re saying that it originated from a verified author. This is especially important if you are an open source contributor. This allows me to start Sublime Merge from within my bash shell in Terminator with smerge. Signing commits is a great way to add additional level of confidence to your code. #echo $ | sed 's:/:\\:g' | sed 's: :\\ :g' Version info OS: Arch Linux Build: 1201 Description When starting sublime-merge from the command line with smerge
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |