I guess I'm striking a nerve this morning and am extra dense. my apologies. I guess people think I'm trolling but that wasn't my intention. Can you explain how I'm being a dick? I'm serious.
"Dick" is not the right word. The problem is that many people are tired of these politically correct observations. It evokes images of a polit-bureau discussing five year plans on how to increase $QUOTA.
the recent fracas with the anti-diversity manifesto published on Google's mailing lists has people on edge, I think. there oughtn't be anything controversial about your statements, but the more right-wing people in tech have been lashing out lately.
Personally I'm not right-wing... Actually quite the opposite. However, I feel that to randomly comment on some perceived shortcoming of the GIT community in a post meant to celebrated a new offering (especially when the comment is randomly about the gender representation given the current events, and the dismissive defense when called out), is disingenuous and "dickish".
I'm curious how that comment was taken as being a dick as well. Your original statement was fine, the follow-up was fine, from my POV. If anything, the comment about forking and requiring was dickish. /shrug
The comment you replied to does feel somewhat disingenuous and perhaps unproductive, but it's possible they're merely lamenting the state of affairs rather than intending to criticize anyone who works (or doesn't) on Git.
> * The "indent" heuristics is now the default in "diff". The diff.indentHeuristic configuration variable can be set to "false" for those who do not want it.
Nice. I set this when I found out about it a few months ago, and had kind of forgotten.. Diffs were just better at not showing new functions as being inserted inside the bottom of another function. Good improvement as a default.
Does anyone here have suggestions for git GUI? I used SourceTree for a few years, but a while back they started adding a bunch of tracking scripts, which I'm uncomfortable with. I can generally get by fine with the CLI, but whenever I need to do anything even slightly unfamiliar, I like being able to put on training wheels and have a GUI guide the way.
I think git would benefit from a type of "training wheels" config, where no action is destructive or irreversible. I've had a few close calls where I almost lost some code due to a git screw-up. Luckily, my local Time Machine backups have always saved my ass.
I use gitk a lot, available on all platforms. I also use GitX to edit my commits, on macOS. Some people look very satisfied by the git GUI built-in in VSCode.
I know it's not a GUI (you'd class it as a TUI, I guess), but Tig is fantastic. I use it in combination with the command line, mainly for quickly viewing recent commits, diffs and staging hunks.
SourceTree doesn't track use/interaction information unless the setting is enabled. You can disable it via the "Help improve SourceTree by sending data about your usage" in the "General" tab in the options screen. If enabled, you can read about the exact data we send here:
https://confluence.atlassian.com/sourcetreekb/sourcetree-ana...
> Luckily, my local Time Machine backups have always saved my ass.
So you do backups for something that already functions like a backup system. That's fascinating. Did you know that Git does not lose anything? You might find 'git reflog' useful if you happen to screw up frequently.
There's quite an interesting GUI for the mac called 'GitUp' which draws a diagram of the structure of the repository (commits, branches) etc, and provides options to modify the repository. Good for helping to understand the structure of the repository.
I mostly use the CLI, but as a history browser, I like QGit very much (tip: invoke as "qgit --all"). Also, I sometimes use "git gui" to split messy diffs into separate commits.
GitEye is a good Git GUI (Eclipse like). You can keep track of all your commits in different branches, you can commit, etc. and it has i.a. a GitHub intigration.
Elegit is a GUI designed to make it easier for people (students, normally) to learn how git works. The idea being that you'd start off with Elegit, figure out what the common commands are actually doing, then switch to the command line.
http://elegit.org/
edit: Linux version is a little bit glitchy with UI texts, when pushing to a repository that have commits ahead, the two invisible options are "pull with rebase" and "pull with merge" respectively.
I've been comparing a couple of Git Guis lately. Till now, the best one I've found is GitExtensions https://gitextensions.github.io/
The gui widgets look a little antiquated, but its greatest feature is that it helps you to "do the right thing". It is not just a bunch of features, they have well thought interactions. When something fails, it guides you to correct the problem.
It is quick, opensource, multiplaform, doesn't force you to have an account with online services, comes with the great Kdiff3 and integrates well with online tools and Windows Explorer.
I like SourceTree, and use it full time, but man does it have some annoying limitations. Like selecting a number of branches from the sidebar and deleting all of them. Something where a GUI should clearly be superior. But SourceTree doesn't allow you to do it. Or customizable Toolbar buttons to launch scripts and automate tasks.
I'd love to see an opinionated git GUI that doesn't aim to replicate all the features of the command line, but instead focuses on streamlining the daily work of a software developer working on features and bugs.
57 comments
[ 5.4 ms ] story [ 130 ms ] threadIf that wasn't the intent, then I'm sorry.
https://gizmodo.com/exclusive-heres-the-full-10-page-anti-di...
You are actually criticizing women for how they spend their free time while claiming to help them.
What have you contributed? Where is your name on the Git commit history? Where does your name appear among the credits for outreach work?
https://news.ycombinator.com/newsguidelines.html
Nice. I set this when I found out about it a few months ago, and had kind of forgotten.. Diffs were just better at not showing new functions as being inserted inside the bottom of another function. Good improvement as a default.
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13344
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13344
https://github.com/git-for-windows/git/releases/tag/v2.14.0....
I think git would benefit from a type of "training wheels" config, where no action is destructive or irreversible. I've had a few close calls where I almost lost some code due to a git screw-up. Luckily, my local Time Machine backups have always saved my ass.
or gitk...
It's the only git GUI that has made me consider switching from the CLI interface.
Does more than putting buttons on existing commands
Improves discoverability of interesting combinations of commands and option flags to make higher order commands
https://github.com/jonas/tig
So you do backups for something that already functions like a backup system. That's fascinating. Did you know that Git does not lose anything? You might find 'git reflog' useful if you happen to screw up frequently.
Doing a "git branch backup" before doing something stupid gives you a more convenient "undo".
Alternatively, just git clone to a new directory before attempting some insane rebase operation.
[0] https://github.com/gitextensions/gitextensions
[1] https://github.com/gitextensions/gitextensions/wiki/Git-Exte... (2.49, although I just tried 2.50.01 and it seems to work too)
edit: Linux version is a little bit glitchy with UI texts, when pushing to a repository that have commits ahead, the two invisible options are "pull with rebase" and "pull with merge" respectively.
The gui widgets look a little antiquated, but its greatest feature is that it helps you to "do the right thing". It is not just a bunch of features, they have well thought interactions. When something fails, it guides you to correct the problem.
It is quick, opensource, multiplaform, doesn't force you to have an account with online services, comes with the great Kdiff3 and integrates well with online tools and Windows Explorer.
I'd love to see an opinionated git GUI that doesn't aim to replicate all the features of the command line, but instead focuses on streamlining the daily work of a software developer working on features and bugs.