GIT GUI CLIENT FOR WINDOWS 7 KEYGEN
There are a few situations where that won't do precisely the desired thing, like if foo branched off from another branch that in turn branched from master or if some commits in foo were rewritten and merged into master. Here's roughly how your workflow would look for me, with foo branched off from master: $ git checkout master The -onto version can be a little hairy the examples in man git rebase are very good but the writing is opaque. I haven't used SmartGit but I can definitely see how a good visual representation makes reasoning about non-trivial rebases simpler. I found that doing complex rebases easier with SmartGit than on the CLI. If you still need Git on Windows, make a point of staying updated - I have colleagues that stubbornly insist on using pre-2.0 Git on Windows and now I stubbornly refuse to help them with Git. Git for Windows has gotten a lot better in the course of the last year (64-bit now), FWIW, but it doesn't quite match up to the Linux version. TL DR: Our project process is shit and there is nothing that I can do about it so I have to work around the problems. I have done some on the CLI before that but after dragging around 200 changed files for 2 or 3 months there have always been changes that I missed while merging or that have been merged incorrectly. So I have to drag my changes over to new branches which are based on the newest head and do a rebase ontop of them.
I would like to merge early and often but I'm not allowed to because the process is shit. The Gui also loads slow but after it has loaded I can navigate the changes much faster than on the CLI. I also have to use some scripts that extended Git for some operations which could also be part of the problem (Why use Git submodules if we can write our own shit.
It was very slow - I don't know what the problem exactly is but it is a large project on Windows and Git on Windows is a 32bit process so this is not ideal. The same thing is true for Git and SmartGit IMHO but at work I have used only the CLI at the beginning when the project migrated to Git and I have had several problems which I could not fix: But searching the history is easier in TortoiseHG than with the CLI in my opinion. In my config Ctrl+G opens a new GfW bash console tab while Ctrl+B (B for bash I guess) opens a new cygwin bash console tab.Well, most of my private projects use Mercurial and the majority of things are done with the CLI. I occasionally use cygwin when I need a bash tool that doesn't come with the GfW environment, which doesn't happen too much since it does have most of what I need for general use and all of what you need to use Git.Įdit: I use ConEmu, which I recommend but which can be kind of hard to configure to your liking. I would describe GfW as much more robust than git under cygwin due to its more narrow scope and excellent maintenance. In fact, its tools are built on msys2, which is basically a fork/variant of cygwin with a different (not as broad) focus. It's a well-maintained fork and a lot of its windows-compatibility patches are accepted into upstream, which keeps the gap between upstream and GfW as small as possible.
The latest version of git under cygwin looks like 2.8.2-1 while GfW is on 2.10.2. GfW is forked from/synced with upstream and has exactly the same interface (command line as well as the git GUI).
0 kommentar(er)
