From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.6 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD, STOX_REPLY_TYPE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 3D1E12018E for ; Fri, 5 Aug 2016 18:42:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754201AbcHESmO (ORCPT ); Fri, 5 Aug 2016 14:42:14 -0400 Received: from smtp-out-1.talktalk.net ([62.24.135.65]:11236 "EHLO smtp-out-1.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934607AbcHESmK (ORCPT ); Fri, 5 Aug 2016 14:42:10 -0400 Received: from PhilipOakley ([2.96.196.12]) by smtp.talktalk.net with SMTP id Vk4NbGPmT0KuvVk4NbE1po; Fri, 05 Aug 2016 19:42:08 +0100 X-Originating-IP: [2.96.196.12] X-Spam: 0 X-OAuthority: v=2.2 cv=RZjSMBlv c=1 sm=1 tr=0 a=OwftO12tmsRMoVo1KIFhnA==:117 a=OwftO12tmsRMoVo1KIFhnA==:17 a=IkcTkHD0fZMA:10 a=pGLkceISAAAA:8 a=OzfMmKlo8qZVzuY7yW8A:9 a=6kGIvZw6iX1k4Y-7sg4_:22 Message-ID: Reply-To: "Philip Oakley" From: "Philip Oakley" To: "Duy Nguyen" , "Johannes Schindelin" Cc: "Junio C Hamano" , "Git Mailing List" , "Eric Sunshine" , "Jeff King" , "Johannes Sixt" , =?UTF-8?Q?Jakub_Nar=C4=99bski?= References: <8ff71aba37be979f05abf88f467ec932aa522bdd.1470051326.git.johannes.schindelin@gmx.de> Subject: Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors Date: Fri, 5 Aug 2016 19:42:10 +0100 Organization: OPDS MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset="UTF-8"; reply-type=original Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.5931 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157 X-CMAE-Envelope: MS4wfH/tx0thgE4bp3FIG0K/KwiHp17/itZVQpDXIOmYjzoLoO9qybB/iNGK2GGgCVZCZepaZ4KdQNj165SnJsKv9gpnWVwKCDpbZCHOhWO9A21MIiTjP6vj jLTuNhroj+1p9oEFV+SmPO6RTwyiQNgBIRoEZPXv8X5wxrWrQdvv/veubT98DwMTHpwj2iuWIppfOuk8AnBpb5n/lwSkYkryAKDo0PQOkoBD8ByuZZL1ZGgm LaNMWebyTzkdhbnvdEa0IGedH2lK3UYKquDKA3MWf/Ssvla3wZdIK34lcijClpVBBayZtVow1JQGZL5BRsQCGX6Y9HVYpTNuWnLJF+spCSjaXVdut22cSh/3 oGk8Hr41FAd6CRzpNoUY8Z1WnZiurg== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: "Duy Nguyen" > On Wed, Aug 3, 2016 at 6:07 PM, Johannes Schindelin > wrote: >> It would be a totally different matter, of course, if you used the >> branches I publish via my GitHub repository, added fixup! and squash! >> commits, published the result to a public repository and then told me to >> pull from there, that would make things easier. We could even introduce a >> reword! construct, to make the review of the suggested edits of the >> commit >> message easier. > > On the topic of fixup and squash and everything. Is anyone else > annoyed that the commit title is taken for fixup!, squash! > instructions? After you have added a few of them, "git log --oneline" > becomes useless. All you see is "fixup! A", "fixup! A", "fixup! B", > "fixup! A". > > Would it be better to let the user control the title? We still need > the cue "fixup!", "squash!"... at the beginning of the title, but the > original commit reference is appended at the end, like s-o-b lines. In the same vein, I always want,with my workflow, to use "fixup! ". This would be to save trying to retype the title correctly, and simply use the abbreviated sha1, which would nicely allow an extra short summaty of what the fixup is about. Philip