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=-3.1 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 A23791F404 for ; Tue, 10 Apr 2018 21:56:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752081AbeDJV4h (ORCPT ); Tue, 10 Apr 2018 17:56:37 -0400 Received: from mout.gmx.net ([212.227.15.15]:32773 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751799AbeDJV4f (ORCPT ); Tue, 10 Apr 2018 17:56:35 -0400 Received: from [192.168.0.129] ([37.201.195.115]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LjIel-1eTwbm28AJ-00dXpi; Tue, 10 Apr 2018 23:56:25 +0200 Date: Tue, 10 Apr 2018 23:56:08 +0200 (DST) From: Johannes Schindelin X-X-Sender: virtualbox@MININT-6BKU6QN.europe.corp.microsoft.com To: =?UTF-8?Q?Martin_=C3=85gren?= cc: Git Mailing List , Junio C Hamano , Jacob Keller , Stefan Beller , Philip Oakley , Eric Sunshine , Phillip Wood , Igor Djordjevic , Johannes Sixt , Sergey Organov Subject: Re: [PATCH v6 15/15] rebase -i --rebase-merges: add a section to the man page In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21.1 (DEB 209 2017-03-23) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323329-445856790-1523397385=:56" X-Provags-ID: V03:K1:u/YWyLl9wXhinuevMxH0rVIeHPlzlFKYTRm6UFi8Vvshq/cb8FI EGIdrr1b3zw+kvJgyEXslMWpF+LcUuW9oGCA6D395821OedbJT0klWlndu/wmQKK1oB0gHx n+6PZ1YQv0kE8b0RhXOp5bzs7M5CRmDVR4dkY/eGzTXcgU7KWCUmyW2zF9YpMZWtvT+ETbb ETkbJt+Yan99juA3qkXxQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:3JZ/HIR1iVw=:zPwsVWUZce8qRAFxtgHxnq WgZ1znUIQaJHXTdE+gdZZL1fzPCcgI8abhHRasGiiThG+dsu1NzStUlk6ZZmAq/mdzuay6zyK 8/UgzcRgmgaaxCHAKX373CbY/3xiGTrOfeZhg3biiEqBkj/TQ/Y+mgU2ErB/IyPIqLeVNO5AJ 9p5z9Az16mqrYlH/nGH/rQ9hC7yv5993SH0Ggrc6hJYmRdau5K2MqA9sGB28bwD3Mg271y0o8 i+VvRShotZVBXzd7IHQy1q85/uo8iIAxAgc6H5w5kE1qc3ZtKskiFpYsfIfHlC8xIiFu/89n0 ht1LVNFhmdz7FxbNnln0fVnNT+/nerHnugau5ynI4T9Al6qID5/G8FnXdTSgl3pbK/vT9qOYU REevbTAruh+gJp4f0Xy2ZHCHzFrwtjTbvmnW1GISV5YNUW9GZcg8VL9equCgm2LzmQvjxJutv WPpStAqUH1RmY1PIBxOF76DyIiHgRi5oz73WvG15NslIvpmC1AZd2k6MPxS/8x2i6cOSDBX/r 6sJK7Hkm6p+nyTx+e9GYLC23puB3NGdcONJnyDmzftgN7adU7KshWjqolvzluLSZRUKN5TefJ HYa9YFukjniD09a9TUGcNcuOF4a6WS8/EnVcjATRrqI9GaSlMQT+lArDAOGeOM839BeudZzaM pJJ5uGNHORaK7JWWfBEIxnU0Q0LmdG3C97bvgOx1no4ot5NfiX4Ozm4VFQKMrNLFIUvfSlhQe Aig9xqa8ONWdKLjQCx+KQuJsQ+z0fktTAXmDmkd1pRKmbjwPfD7jGBUHy7Bn3pK/2NkAbVS1R fMTWlN7Og9HDOYCcbrVdixUQt6ysnUGKvAPcWhtrvLxluQ4FeE= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-445856790-1523397385=:56 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Hi Martin, On Tue, 10 Apr 2018, Martin =C3=85gren wrote: > On 10 April 2018 at 14:30, Johannes Schindelin > wrote: > > The --rebase-merges mode is probably not half as intuitive to use as > > its inventor hopes, so let's document it some. >=20 > I quite like this documentation. Well-structured and well-paced. > Already after the first reading, I believe I understand how to use this. Thanks! > > +The `label` command puts a label to whatever will be the current > > +revision when that command is executed. Internally, these labels are > > +worktree-local refs that will be deleted when the rebase finishes or > > +when it is aborted. That way, rebase operations in multiple worktrees > > +linked to the same repository do not interfere with one another. >=20 > In the above paragraph, you say "internally". I guess that I should reword this to say "These labels are created as worktree-local refs (`refs/rewritten/