@b0rk Hooks? Packing/gc? Remotes?

@b0rk I'd definitely put in a vote for `git bisect` -- it is a really profound tool and IME one of the bits that junior engineers are least likely to have in their toolboxes. It's also one of the big reasons people use rebase workflow.

@b0rk sure would!

@b0rk A git "best of failures" ?

@b0rk Definitely git bisect.

@b0rk another vote for bisect, it feels like something I should know and use but I haven't touched it at all

@b0rk bisect as a concept is a tool that has been very useful to me over the years, but not so much "git bisect". It seems that almost every large software project invents some way to bisect over nightly builds for example (Chromium and Firefox both have tools for this)... I think a zine about bisection might be cool.

@b0rk git worktree please 🙏

@b0rk I was thinking on a bit more guidance around resolving merge conflicts. The page describes the format, but doesn't give precise instruction how to edit the file (which lines need to go, which should stay etc.) and which git commands to call next.

@b0rk I would be curious about details of the protocol between my machine and remotes.

Lets say I would like to implement a Heroku-like server on my own. How would I do that? What is already there? What do I have to implement?

I started several times to look into this, but always got lost because it is hard to get an overview and a starting point. At least it was for me.

@b0rk the magic of `git maintenance start`

@b0rk One more vote for git bisect, please. And maybe merge strategies: -X ours/theirs -s ours and how to use git commit-tree -p to do a -s theirs.

@b0rk are git submodules covered in the zine?

@b0rk worktrees are an underused feature that I find very useful.

@b0rk To be selfish, would love a blurb on git patch, but git worktree would be great too! (selfish because as amazing as git bisect is, I feel like I got that topic locked down haha).

@b0rk rebase interactive is a neat one, that and git add --patch

@b0rk Worktrees and submodules are two things that come to mind. Maybe commit signing too?

@b0rk perhaps the cool things that can go into your git configuration, like includeIf and alias

@b0rk git-maintenance(1)!!!

@b0rk Worktrees would be a good choice: They're underused IMHO because they are a relatively recent addition (2015) and their great boon is not obvious.

They're great for ephemeral work because afterwards you can nuke them without concern. The alternative is a short-lived separate clone, but if you're like me you'll want to carefully check for unrelated work in accumulated branches/stashes/etc before deleting it (see https://news.ycombinator.com/item?id=30400869). Cognitively this makes a big difference IMHO.

@b0rk Ran into git submodules again for the first time in years and was reminded how weird they are and how easy it is to get things borked up. Looked in your zine first 🙂, but no joy 🙁, so went to the official docs 🤪

@b0rk cherry picking!

@b0rk git bisect and/or worktree sounds great!

@b0rk
Wow, nice one. 😃