Quote:
Originally Posted by evo2
have you tried gitk? If it does not suit your needs, perhaps you could tell us what features you are actually looking for (saying like "program x" is only useful to people who have also used "program x").
|
Well, I can't easily describe how what I'm looking for differs from git itself (other than to say "like TortoiseGit") since the whole issue is that I find much of plain-vanilla git rather impenetrable. But I'll try:
In my experience, using git directly seems to require fairly strong understand of git's internals. I've seen it described as "like driving a car by reaching under the hood and pulling on all the wires" - Not everyone agrees with that analogy, but it DOES very closely match my experiences with direct usage of git.
What I need is a straightforward interface for, at the very least, these actions (some of them are actually pretty easy with git, like cloning, but a lot of things tend to get rather hairy. And then they get REALLY weird whenever I need to venture outside my more usual sets of actions):
- Clone a git repo
- Init a new repo
- Add/delete/move/rename files and directories
- Commit changes
- Revert a file, directory or entire working copy
- Diff different versions of files with a user-defined diff tool
- View commit log
- View history of a given file
- View changed/unchanged/added/deleted/ignored/unversioned status of files in working copy
- View the repo contents at a given commit (including files/dirs that weren't modified in that commit).
- Create a branch or tag
- Switch to a specific branch/tag/commit
- Add/edit remotes (and be able to reasonably handle login-protected and key-protected remotes)
- Pull a branch from a remote branch without any auto-merging
- Push a branch to a remote branch without any auto-merging
- Push/pull tags to and from a remote
- (occasionally) Merge branches
Good integration with Dolphin is preferred, but CLI or a GUI that isn't integrated with a file manager is at least workable. Integration with GitHub would be fantastic, but isn't necessary.
TortoiseGit does a pretty good job with most of that, but I really don't like being tied to Windows for this stuff.