My advice would be to use a solid git client like Git fork (paid + free trial), the GitHub app (free), or Git Kraken (free for non commercial, or paid), and watch some tutorials. I think the hard part with GUI git apps is that all the advanced functionality is. It's great at checking out and syncing branches, and doing (partial) commits. The Github Desktop is criminally underrated in my opinion Yes, it's pretty underfeatured and lacks all the advanced features, but I consider that a plus. Let's Make Sure GitHub Doesn't Become the Only Option.Try installing the msi version under 'Prefer the MSI?' from. All you have to do is highlight the line(s) you want and click stage/unstage.There's a lot of places that do this and clients to use, but I personally use Github's stuff. 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. ![]() Make staging line hunks more obvious #1688.One popular Git GUI app, GitHub Desktop, apparently has no plans to support Split View Staging: What other macOS Git GUI app or tool offers a commit/staging view similar to Split View Staging offered by SourceTree? A file can exist in both the staged and unstaged panes. This allows you to easily see exactly which changes are staged at any given time, and commit only those specific changes. All of the unstaged changes are shown in the other pane. Then, all of the currently staged changes are shown in a single pane of the split view. This view allows individual lines, hunks, or single-character changes to be staged independently. This view perfectly fits my mental model of how a staging view should work. The problem is that I'm heavily dependent on SourceTree's Split View Staging view of the staging area. ![]() I would very much like to reduce my dependency on Atlassian's product. Unfortunately, SourceTree is incredibly slow, buggy, lacking features, and rarely updated. I'm very productive with the app and find it far preferable to the command line Git interface for common tasks.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |