From: Hallvard B Furuseth <h.b.furuseth@usit.uio.no>
To: <git@vger.kernel.org>
Subject: How to commit incomplete changes?
Date: Thu, 15 Dec 2011 00:24:33 +0100 [thread overview]
Message-ID: <4cfc9cf0515b1bc751f6aa0de4f55e2a@ulrik.uio.no> (raw)
Do people have any feelings or conventions for how and when to publish
a series of commits where the first one(s) break something and the next
ones clear it up? I've found some discussion, but with vague results.
I'm about to commit some small edits which go together with bigger
generated changes. It seems both more readable and more cherry-pick-
friendly to me to keep these in separate commits.
What I've found is I can use a line in the commit message like
"Incomplete change, requires next commit (update foo/ dir)."
and, if there is any point, do a no-ff merge past the breakage.
--
Hallvard
next reply other threads:[~2011-12-14 23:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-14 23:24 Hallvard B Furuseth [this message]
2011-12-15 6:44 ` How to commit incomplete changes? Alexey Shumkin
2011-12-15 7:11 ` Hallvard B Furuseth
2011-12-15 8:22 ` Alexey Shumkin
2011-12-15 8:39 ` Alexey Shumkin
2011-12-15 22:51 ` Neal Kreitzinger
2011-12-16 0:21 ` Junio C Hamano
2011-12-16 12:15 ` Hallvard Breien Furuseth
2011-12-16 12:58 ` Hallvard Breien Furuseth
2011-12-16 1:49 ` Tomas Carnecky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4cfc9cf0515b1bc751f6aa0de4f55e2a@ulrik.uio.no \
--to=h.b.furuseth@usit.uio.no \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).