[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: No commit in vc?

From: David De La Harpe Golden
Subject: Re: No commit in vc?
Date: Sun, 31 Jan 2010 16:40:52 +0000
User-agent: Mozilla-Thunderbird (X11/20091109)

Thien-Thi Nguyen wrote:

What this thread has taught me is that for bzr, "merge" does
not imply "commit".  To DTRT, VC "merge" should allow for
this split in all backends,

Yeah, merge doesn't necessarily imply commit in git either, e.g. when there's conflicts... and you can in fact suppress automagic stuff with "git merge --no-commit --no-ff"

(the --no-ff stops it doing a fastforward even if a fastforward
is possible. Actually, you'd seldom want to not do it, but the option's
there in vaguely recent git, contrary to what bzr folk seemed to think IIRC)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]