From: martin f krafft Date: Wed, 31 Oct 2007 21:27:30 GMT Subject: Re: unmerging feature branches Message-ID: <20071031212730.GA32170@piper.oerlikon.madduck.net> In-Reply-To: <20071031211658.GA5430@inspiron> also sprach Alejandro Martinez Ruiz [2007.10.31.2216 +0100]: > So how about an "undo" command or a switch for revert with a special > meaning like "hey, this one is a nice commit, but it ain't ready yet, > I'd like you to ignore I ever committed the thing when merging or > rebasing again, thanks"? Revert does exactly that, by reverting the content. That's all Git cares about. Does http://lists-archives.org/git/634475-unmerging-feature-branches.html make it clear? -- martin | http://madduck.net/ | http://two.sentenc.es/ "getting a scsi chain working is perfectly simple if you remember that there must be exactly three terminations: one on one end of the cable, one on the far end, and the goat, terminated over the scsi chain with a silver-handled knife whilst burning *black* candles." -- anthony deboer spamtraps: madduck.bogus@madduck.net