From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit Date: Wed, 27 May 2015 21:44:34 +0200 Message-ID: References: <1432676318-22852-1-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> <1506177855.44397.1432738386768.JavaMail.zimbra@ensimag.grenoble-inp.fr> Mime-Version: 1.0 Content-Type: text/plain Cc: Remi Galan Alfonso , Johannes Schindelin , git@vger.kernel.org, Remi Lespinet , Guillaume Pages , Louis-Alexandre Stuber , Antoine Delaite To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed May 27 21:44:59 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YxhG0-0001EH-N4 for gcvg-git-2@plane.gmane.org; Wed, 27 May 2015 21:44:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753534AbbE0Toq (ORCPT ); Wed, 27 May 2015 15:44:46 -0400 Received: from mx1.imag.fr ([129.88.30.5]:50435 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753130AbbE0Too (ORCPT ); Wed, 27 May 2015 15:44:44 -0400 Received: from clopinette.imag.fr (clopinette.imag.fr [129.88.34.215]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id t4RJiVRv006693 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 27 May 2015 21:44:32 +0200 Received: from anie.imag.fr (anie.imag.fr [129.88.7.32]) by clopinette.imag.fr (8.13.8/8.13.8) with ESMTP id t4RJiYGb025482; Wed, 27 May 2015 21:44:34 +0200 In-Reply-To: (Junio C. Hamano's message of "Wed, 27 May 2015 12:21:41 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Wed, 27 May 2015 21:44:32 +0200 (CEST) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: t4RJiVRv006693 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: matthieu.moy@grenoble-inp.fr MailScanner-NULL-Check: 1433360674.22471@GcsKqMMn7PL93DIwIigNug Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano writes: > Matthieu Moy writes: > >> I find it weird to write >> >> noop > > True, but then it can be spelled > > # <sha1> <title> I do find it weird too. "#" means "comment", which means "do as if it was not there" to me. And in this case it does change the semantics once you activate the safety feature: error out without the "# <sha1> <title>", rebase dropping the commit if the comment is present. -- Matthieu Moy http://www-verimag.imag.fr/~moy/