git-cola
sapling
git-cola | sapling | |
---|---|---|
15 | 43 | |
2,191 | 5,815 | |
1.0% | 1.1% | |
9.6 | 10.0 | |
17 days ago | 3 days ago | |
Python | Rust | |
GNU General Public License v3.0 only | GNU General Public License v3.0 only |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
git-cola
-
Ask HN: Can we do better than Git for version control?
> Visual Studio does a decent job of abstracting the GIT nuances, but I personally use GIT Extensions, which looks and feels much better on Windows than the other cross platform UIs.
IDEs and text editors sometimes have nice Git integrations in the UI, but I wanted standalone software that I can use for anything from various programming projects, to something like gamedev projects (with Git LFS) or arbitrary documents.
In the end, I just forked over some money for GitKraken, it's pretty good, especially with multiple accounts on the same platforms, when you want to switch between them easily: https://www.gitkraken.com/
There's also Sourcetree which I used before then, kind of sluggish but feature complete: https://www.sourcetreeapp.com/
For something more lightweight, I also enjoyed Git Cola on various OSes: https://git-cola.github.io/ Even Git documentation has a page on the software out there, a good deal of which is free and has good platform support: https://git-scm.com/downloads/guis
Quite frankly, I spend like 90% of the time using a GUI interface nowadays, when I want to easily merge things, or include very specific code blocks across multiple files in a commit, or handle most of the other common operations. Of course, sometimes there's a need to drop down to the CLI, but you're right that some GUI software feels like it actually improves the usability here.
- I don't know why so many devs avoid a GUI for Git
-
Why Git Is Hard
I think Git can be a pretty pleasant experience for most folks, as long as you use the basic features and maybe even consider a GUI, anything from Git Cola (free: https://git-cola.github.io/), to something like GitKraken (paid for all features: https://www.gitkraken.com/).
Curiously, the latter also let me setup different accounts that I can switch between with a simple dropdown, which was otherwise annoying when you have Gitea, GitHub, GitLab and others to manage, way easier than https://docs.github.com/en/account-and-profile/setting-up-an...
Either way, suddenly you see the graph of your repo and most of the common actions are a click away, you can just let your brain idle and think about other things you're doing instead, in addition to that working really well with staging chunks of your code, or individual files, cherrypicking and so on.
Then again, personally I prefer squashing in merge/pull requests instead of rebasing, or even just doing regular merge commits and leaving the history as is (which doesn't really scale, but I haven't gotten to the point where that matters that much), so how I use Git won't work for everyone.
- Top 10 Git GUI Clients for Linux in 2023
- Exploring the Top 10 Git GUI Clients for Linux in 2023
-
Git-SIM: Visually simulate Git operations in your own repos with a single termi
> We now have a large selection of tools that allow you to visualize what's going on (I use git-kraken), as well as google for help on doing something that isn't in muscle memory.
Git Kraken is excellent, though Git has a page on various GUIs, many of which are free with no restrictions: https://git-scm.com/downloads/guis
Personally, on Windows I like SourceTree: https://www.sourcetreeapp.com/
Some that have worked with SVN back in the day like TortoiseGit: https://tortoisegit.org/
On *nix Git Cola seems to do the job for me: https://git-cola.github.io/
Then again, the most complex workflow I've worked with was Git Flow and I didn't need anything more advanced than that. Come to think of it, I don't really do rebases often either and mostly just take advantage of squashing commits through GitLab/Gitea and such, when needed.
But hey, that's also valid, using Git in a way where you get version control but mostly keep the technical details out of your way (though Git LFS and certain cases with particular line endings being needed does make you drop down occasionally).
-
Report: More Developers Use Linux Than a Mac
Try git cola. It's not the slickest but it scratches my pointy/clicky desires for git pretty well.
- How can I find someone to explain
-
Idiot Proof Git
If you can tolerate a GUI, Git Cola might be a solution. I'm using it exclusively for some 5 years now – it's lightweight enough, but still makes you think about what you're about to commit. You can add things to .gitignore directly from there, too.
https://git-cola.github.io/
Default layout is pretty barebones, here's what I'm doing instead: https://u.ale.sh/my-git-cola-screenshot.png
-
I think the real reason why people think using the terminal is required on Linux is a direct result of the Linux terminal being so much better than the Windows terminal
i still don't know how to split one commit into multiples (without going insane (if it's even possible)) without a gui like https://github.com/git-cola/git-cola, and that should be a simple operation (especially with git's "split every change into individual commits make it easier to cherry pick" conventions)
sapling
- Monorepos: Please Don't (2019)
-
Twenty Years Is Nothing
I am personally surprised that TFA didn't mention either jj or Sapling [0] given its emphasis on how both Git and svn were both made to be backwards compatible!
[0] https://github.com/facebook/sapling
-
Jj init – getting serious about replacing Git with Jujutsu
Lots to digest here! I have been keeping an eye on Pijul so it is cool to see some of its features implemented in jj. Sapling[0], similarly, is a new VCS tool out there which can work with a git repo. It also has anonymous branches, no staging area, supports stacked commits and can track the history of a commit over time. I've been using a similar workflow to the article's author: git with a UI to handle commits of hunks of a file to group related changes. My working branch often has unrelated changes that get tossed from branch to branch as I am able to commit. I haven't figured out where these new tools fit into my workflow yet, but I am glad there's new options that will help making working on a project more flexible and organized.
[0]: https://sapling-scm.com
- Sapling – A VCS from Meta
- Sapling: A Scalable, User-Friendly Source Control System
-
Ask HN: Can we do better than Git for version control?
yep both extended it and have versions that can work against GitHub/git servers.
sapling scm from meta has I think the best cli and VS code UX https://sapling-scm.com/
jj from google is also mercurial derived with very similar cli features like histedit and has support for deferring conflict resolution https://github.com/martinvonz/jj
- Your GitHub pull request workflow is slowing you down
- Sapling – A Scalable, User-Friendly Source Control System
- Mononoke
What are some alternatives?
VCS - This is my first simple version control system
go-git - A highly extensible Git implementation in pure Go.
Guitar - Git GUI Client
nextjs-template - A bit personalized version of the `with-typescript-eslint-jest` template.
GitUp - The Git interface you've been missing all your life has finally arrived.
FTC-for-VS-Code - A VS Code extension for accessing FTC snippets, debugger, and Android cmdline tools from a button
VirtScreen - Make your iPad/tablet/computer into a secondary monitor on Linux.
buck2-prelude - Prelude for the Buck2 project
django-markdownx - Comprehensive Markdown plugin built for Django
reactide - Reactide is the first dedicated IDE for React web application development.
webdiff - Two-column web-based git difftool
dulwich - Pure-Python Git implementation