From patchwork Wed Aug 9 17:15:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oswald Buddenhagen X-Patchwork-Id: 13348236 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E304C001E0 for ; Wed, 9 Aug 2023 17:15:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232906AbjHIRPo (ORCPT ); Wed, 9 Aug 2023 13:15:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232817AbjHIRPi (ORCPT ); Wed, 9 Aug 2023 13:15:38 -0400 Received: from bluemchen.kde.org (bluemchen.kde.org [IPv6:2001:470:142:8::100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E108F1FF5 for ; Wed, 9 Aug 2023 10:15:37 -0700 (PDT) Received: from ugly.fritz.box (localhost [127.0.0.1]) by bluemchen.kde.org (Postfix) with ESMTP id DA8FE24312; Wed, 9 Aug 2023 13:15:31 -0400 (EDT) Received: by ugly.fritz.box (masqmail 0.3.6-dev, from userid 1000) id 1qTmmR-lE7-00; Wed, 09 Aug 2023 19:15:31 +0200 From: Oswald Buddenhagen To: git@vger.kernel.org Cc: Junio C Hamano Subject: [PATCH v3 2/2] doc: revert: add discussion Date: Wed, 9 Aug 2023 19:15:31 +0200 Message-Id: <20230809171531.2564807-2-oswald.buddenhagen@gmx.de> X-Mailer: git-send-email 2.40.0.152.g15d061e6df In-Reply-To: <20230809171531.2564807-1-oswald.buddenhagen@gmx.de> References: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de> <20230809171531.2564807-1-oswald.buddenhagen@gmx.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The section is inspired by git-commit.txt. Signed-off-by: Oswald Buddenhagen --- Cc: Junio C Hamano --- while thinking about what to write, i came up with an idea for another improvement: with (implicit) --edit, the template message would end up being: This reverts commit , because . --- Documentation/git-revert.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index d2e10d3dce..2b52dc89a8 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -142,6 +142,16 @@ EXAMPLES changes. The revert only modifies the working tree and the index. +DISCUSSION +---------- + +While git creates a basic commit message automatically, you really +should not leave it at that. In particular, it is _strongly_ +recommended to explain why the original commit is being reverted. +Repeatedly reverting reversions yields increasingly unwieldy +commit subjects; latest when you arrive at 'Reapply "Reapply +"""' you should get creative. + CONFIGURATION -------------