News for hackers. Stuff that matters.

A comment on Git techniques. Parent comment

Re:Git techniques by rectang on Thursday November 11, 2021 @09:33AM (#29188192)
> This is when you believe that your program should at the very least compile (or pass tests) at any point in the history.

I only expect that at merge commits, which I can see with `git log --merges`.

[ Parent | on HN ]
Re:Git techniques by bonzini on Thursday November 11, 2021 @05:47PM (#29194252)
Why would you? Linux (and any other C or Rust open source project I have worked on) compile and work at any commit.
[ Parent | on HN ]
Re:Git techniques by rectang on Thursday November 11, 2021 @06:01PM (#29194359)
Most of the time, that's what I expect. However, sometimes when proceeding step-by-step through a large refactor or a large feature addition, the codebase may be left temporarily in an incomplete state.

My preference under such circumstances is to favor clarity of commit history, and leave the step-by-step commits intact — with the requirement that they always be located in a feature branch behind a merge commit.

[ Parent | on HN ]