meejah, 2 months ago

@b0rk This probably isn't exactly what you're looking for, but https://www.dulwich.io/ is a great Python library that I've used several times to make Git stuff happen that probably could have been accomplished with the correct bash incantations (e.g. "tell me the next version number") but for me counts as "time to use not-bash" complexity-wise.

maybeanerd, 2 months ago

@b0rk I use mob a lot to help with pair or mob programming sessions. There's also IDE integrations, e.g. for VSCode

https://mob.sh/

alper, 2 months ago

@b0rk Not sure where git-town falls but it’s been helpful for my use case of: “I don’t care at all about any of this. Just ship the damn code.”

derickr, 2 months ago

@b0rk gitg - for visualising branches and commits etc.

ghickman, 2 months ago

@b0rk git-toolbelt has a lot of great additions, but my favourite is git-fixup-with -r. It gels nicely with building a review-friendly feature branch.

https://github.com/nvie/git-toolbelt

tbroyer, 2 months ago

@b0rk I think I've only ever used one: filter-repo.

(in my case, to split a repo in two; had to do it a couple times)

https://github.com/newren/git-filter-repo/

glyph, 2 months ago

@b0rk https://hub.github.com

leftpaddotpy, 2 months ago

@glyph fyi that one has been effectively replaced with the cli called "gh". but for some reason they didn't deprecate hub? wat.

vathpela, 2 months ago

@leftpaddotpy @glyph reeks of a different team and people writing tools for their promotion packets ;)

glyph, 2 months ago

@vathpela @leftpaddotpy yeah I almost wrote "even though it's deprecated" but then I saw it's… not? which, hooray, hub does what I want and I have no particular interest in learning a new tool that works differently and doesn't have any other features I want, so I'm glad they didn't

vathpela, 2 months ago

@glyph @leftpaddotpy before I knew about these, I also wrote a tool called 'git-pr' (also at https://github.com/vathpela/git-toys ) such that if you add:
fetch = +refs/pull//head:refs/remotes/origin/pr/
fetch = +refs/pull//merge:refs/remotes/origin/pr-merge/
fetch = +refs/pull/:refs/pull/origin/
to the remote section of your .git/config for a repo, it'll fetch the PRs and you can do "git pr show 21" "git pr cherry-pick 21" etc. It's kind of janky but it works for what it does.

glyph, 2 months ago

@vathpela @leftpaddotpy Oh looks like I do use gh for this, because gh pr checkout was the only one I could find that set it up so I could push to contributor forks easily. Does git-pr do this too?

vathpela, 2 months ago

@glyph @leftpaddotpy no, because you can't create PRs on GitHub without using their rest API and that was too much work for my tiny brain. Read my git-pr implementation and bask in the glory of how much code it isn't ;)

glyph, 2 months ago

@vathpela @leftpaddotpy no I don't mean creating a PR, I just mean lining up all the stuff about the approriate push URL. Is that what "pr-merge" is? is that a magic Github string or something of your own invention?

samwho, 2 months ago

@b0rk I'm not sure if this is quite what you're asking but I use https://github.com/Wilfred/difftastic as my git diff tool and I can't imagine going back to the default.