From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: git with custom diff for commits Date: Tue, 18 Dec 2007 12:40:04 -0800 Message-ID: <7vzlw7ybx7.fsf@gitster.siamese.dyndns.org> References: <60687a7d0712171456p14328817y5aa229f0df23c02f@mail.gmail.com> <7vbq8o6gxw.fsf@gitster.siamese.dyndns.org> <7vodco1him.fsf@gitster.siamese.dyndns.org> <000001c841b5$89fcef00$762a14ac@na.acco.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "'Junio C Hamano'" , "'Matthieu Moy'" , "'Johannes Schindelin'" , To: "Gerald Gutierrez" X-From: git-owner@vger.kernel.org Tue Dec 18 21:41:03 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1J4jFK-00018o-Pr for gcvg-git-2@gmane.org; Tue, 18 Dec 2007 21:40:59 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752692AbXLRUke (ORCPT ); Tue, 18 Dec 2007 15:40:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752284AbXLRUke (ORCPT ); Tue, 18 Dec 2007 15:40:34 -0500 Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:58261 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752190AbXLRUkd (ORCPT ); Tue, 18 Dec 2007 15:40:33 -0500 Received: from a-sasl-quonix (localhost [127.0.0.1]) by a-sasl-quonix.pobox.com (Postfix) with ESMTP id 1DA88641A; Tue, 18 Dec 2007 15:40:27 -0500 (EST) Received: from pobox.com (ip68-225-240-77.oc.oc.cox.net [68.225.240.77]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-sasl-quonix.pobox.com (Postfix) with ESMTP id 52D206414; Tue, 18 Dec 2007 15:40:07 -0500 (EST) In-Reply-To: <000001c841b5$89fcef00$762a14ac@na.acco.com> (Gerald Gutierrez's message of "Tue, 18 Dec 2007 12:35:28 -0800") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: "Gerald Gutierrez" writes: > I ended up doing the following, which sounds similar to the above. Instead > of doing mysqldump into data.sql, it goes into data.sql.2 which I compare > with the checked in data.sql using "diff -I ". If there are no > differences, I delete data.sql.2. If there are differences, I move > data.sql.2 into data.sql and check in. Perhaps not as elegant but certainly > works. Heh, that's essentially how automated html/man branches are managed ;-)