But, it's not open-source, and costs extra money to use long-term.Īny of these will work with Github, Bitbucket, or any other public or private repo that uses the git protocol. Try them out, and see what works for you. ![]() With Git 2.22 (Q2 2019), that will be easier, since the configuration will be done for you, and " git mergetool" learned to offer Sublime Merge ( smerge) as one of its backends.Īs commented in SublimeTextIssues/Merge issue 19: In addition to using Sublime Merge, mentioned above, you can invoke it directly with git difftool now. Usage: git config -global merge.tool smergeĪnd then just git mergetool or git difftool. (Merged by Junio C Hamano - gitster - in commit 5116eab, ) mergetools: add support for smerge (Sublime Merge) See commit f57b2ae, commit eb12adc () by David Aguilar ( davvid). All you have to do is highlight the line(s) you want and click stage/unstage.Teach difftool and mergetool about the Sublime Merge " smerge" command. The wording is a little bit confusing to me, but that's mostly because I cannot seem to remember which side is "mine" and which is "theirs" when fixing a merge conflict.Įdit: I should note that it has the ability to stage/unstage custom hunks. It is efficient and lets me pick between the two sides which lines to keep from which source. The built-in merge tool is very nicely done as well. I routinely have two windows open, with about 30 tabs between the two. There are a few things missing from SourceTree (for example, I cannot see if my commit was signed with my GPG key - I have to run a git command in the terminal to check - but the option to have commits signed IS there and it does work, IF you remember to enable it for every repository), but I've been using it every day for 6 months without a single slowdown or problem. Updates are not frequent, but they do happen. I've been using Fork ( - it's free for Mac and Windows) for almost 6 months now, after leaving SourceTree behind. I am on a constant pursuit to select and use the best tools available for the job at hand. No affiliation whatsoever to any of the mentioned apps. I'd recommend you to give the various tools mentioned on Git SCM webpage a try and choose as per your liking. In the diff view on the right, you can then select the exact chunks & lines you want to add to the next commit. Select a changed file in the Working Copy list. Tower takes this one step further by allowing you to determine the exact chunks and even lines you want to add: With Git's staging area, you can determine which changes exactly you want to have in the next commit. One of the things that make Git such a great tool is the ability to craft granular commits. It is quite popular among software developers. It's a native macOS app with excellent UX and performance. If you click on a file to view the diff, you can selectively unstage lines or hunks. Unstage files by selecting a staged file and hitting the Unstage File button that appears. Along with adding new features, the team behind the client is constantly working on improving overall performance with frequent releases. Although it's not a native app, but it comes with extensive set of features. GitKraken is a free macOS Git GUI client. ![]() I too am a heavy user of SourceTree, but keep up with it's minor annoyances. The list is a living document with new apps getting added over time.Īs you are looking for a macOS app with support for granular staging/unstaging support, I'll list one free and one paid tool each here which I use/have used personally. The listed tools differ in their performance and feature set. There are various free as well as commercial macOS Git GUI apps available as listed on Git SCM webpage.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |