I use SSH to manage access to my Git repos, and have. I use Notepad++ for editing commit messages, and for interactive rebase: I can’t quite remember why I switched from WinMerge to Beyond Compare, but both tools are worth checking out to see what you prefer.Īside from Beyond Compare being great software, one of the things that has kept me using it has been the fact that they have consistently offered free upgrades to the latest version of their product - rather than paying for a new license every year or two, I’m still using my original license which I purchased about 6 years ago. Before Beyond Compare, I was using Winmerge, which is a great alternative. WINMERGE GIT PROI’ve been using Beyond Compare Pro for years, since first reading about it on Nick Craver’s Blog. Whenever I need to see diffs, or resolve a merge conflict, rather than continuing on the command line, I switch to Sourcetree, and use it to open Beyond Compare, which is my favorite tool for diffs and 3-way merges. Diffs and 3-way merges via Sourcetree and Beyond Compare WINMERGE GIT FOR MACSourcetree is available for Mac and Windows, and I find it way easier to use than that default gitk and git-gui.īefore using SourceTree, I used to use Tortoise Git, which is still around if you want to check it out. I use Sourcetree for anything that feels more convenient via a GUI such as browsing the source history, or when I want to add or discard specific sections of specific files to a commit. To open the Bash shell within Cmder, start by clicking the green plus icon in the lower right of the window, then: You get all the things that you’d expect from a modern console. When you first open Cmder, the default shell that pops up will be the regular windows CMD shell, wrapped within the Cmder console.īecause the CMD shell is wrapped in Cmder, the interface is a big step up from the regular built-in CMD shell that comes with Windows. WINMERGE GIT FULLMake sure that you download the full Cmder, which contains Git for Windows, along with many of the tools that you may be already familiar with such as grep and SSH. Here’s what the Cmder console looks like when you’re using Bash: I find the command line generally easiest for for creating commits, rebasing, pushing branches, etc. Git commands for Windows are the same as they are on Linux. Prior to switching to mostly Windows development back in 2006, I used Linux nearly exclusively, and still find the Bash shell to be a more comfortable interface than the regular Windows command prompt. I use Git For Windows via the Bash shell which comes bundled with Cmder, and always have a console window open.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |