From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 60EF21F8C6 for ; Fri, 2 Jul 2021 22:38:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230099AbhGBWkz (ORCPT ); Fri, 2 Jul 2021 18:40:55 -0400 Received: from smtprelay06.ispgateway.de ([80.67.31.96]:45066 "EHLO smtprelay06.ispgateway.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230438AbhGBWky (ORCPT ); Fri, 2 Jul 2021 18:40:54 -0400 X-Greylist: delayed 28476 seconds by postgrey-1.27 at vger.kernel.org; Fri, 02 Jul 2021 18:40:54 EDT Received: from [84.163.67.238] (helo=[192.168.2.202]) by smtprelay06.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1lzRnJ-00066B-T1; Sat, 03 Jul 2021 00:37:57 +0200 Subject: Re: [PATCH 5/5] config: add default aliases To: Felipe Contreras , =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Cc: git@vger.kernel.org, Junio C Hamano References: <20210702100506.1422429-1-felipe.contreras@gmail.com> <20210702100506.1422429-6-felipe.contreras@gmail.com> <8735sxaqln.fsf@evledraar.gmail.com> <60df8c20e8518_28bb20846@natae.notmuch> From: martin Message-ID: <5cbb845f-b8a6-939e-cf37-a3b375438616@mfriebe.de> Date: Sat, 3 Jul 2021 00:38:18 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <60df8c20e8518_28bb20846@natae.notmuch> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB X-Df-Sender: bWVAbWZyaWViZS5kZQ== Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 02/07/2021 23:58, Felipe Contreras wrote: > Ævar Arnfjörð Bjarmason wrote: >>> +ALIAS >>> +~~~~~ >>> +'git rb' >> So 'r'e'b'ase, not 're'base. > I don't know if 're' makes more sense here. re: restore rebase reset And restore is on the level of checkout => so more important.