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.5 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,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 87FDE1F8C6 for ; Fri, 30 Jul 2021 08:32:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237922AbhG3Icq (ORCPT ); Fri, 30 Jul 2021 04:32:46 -0400 Received: from smtp31.hk.chengmail.me ([113.10.190.196]:45502 "EHLO smtp31.hk.chengmail.me" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230336AbhG3Icp (ORCPT ); Fri, 30 Jul 2021 04:32:45 -0400 X-CHENGMAILHOST: 113.10.190.196 X-CHENGMAIL-INSTANCEID: 634c.6103b915.508ba.0 Date: Fri, 30 Jul 2021 16:32:21 +0800 From: "lilinchao@oschina.cn" To: git Cc: "Junio C Hamano" Subject: Should "git apply"'s option "--3way" imply "--index" in option description? X-Priority: 3 X-GUID: F88B2002-5B73-4A7B-9C69-9DCCC19CEEC8 X-Has-Attach: no X-Mailer: Foxmail 7.2.19.158[cn] Mime-Version: 1.0 X-source-message-id: <202107301631209389909@oschina.cn> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Message-ID: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org bGlrZSB0aGlzOgoKZGlmZiAtLWdpdCBhL2FwcGx5LmMgYi9hcHBseS5jCmluZGV4IDQ0YmMzMWQ2 ZWIuLjBiMzUzYWY5NmMgMTAwNjQ0Ci0tLSBhL2FwcGx5LmMKKysrIGIvYXBwbHkuYwpAQCAtNTAy NCw3ICs1MDI0LDcgQEAgaW50IGFwcGx5X3BhcnNlX29wdGlvbnMoaW50IGFyZ2MsIGNvbnN0IGNo YXIgKiphcmd2LArCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBPUFRfQk9PTCgwLCAiYXBwbHkiLCBm b3JjZV9hcHBseSwKwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgTl8oImFsc28g YXBwbHkgdGhlIHBhdGNoICh1c2Ugd2l0aCAtLXN0YXQvLS1zdW1tYXJ5Ly0tY2hlY2spIikpLArC oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBPUFRfQk9PTCgnMycsICIzd2F5IiwgJnN0YXRlLT50aHJl ZXdheSwKLSDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoE5fKCAiYXR0ZW1wdCB0 aHJlZS13YXkgbWVyZ2UsIGZhbGwgYmFjayBvbiBub3JtYWwgcGF0Y2ggaWYgdGhhdCBmYWlscyIp KSwKKyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoE5fKCAiYXR0ZW1wdCB0aHJl ZS13YXkgbWVyZ2UsIGZhbGwgYmFjayBvbiBub3JtYWwgcGF0Y2ggaWYgdGhhdCBmYWlscyhpbXBs aWVzIC0taW5kZXgpIikpLArCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCBPUFRfRklMRU5BTUUoMCwg ImJ1aWxkLWZha2UtYW5jZXN0b3IiLCAmc3RhdGUtPmZha2VfYW5jZXN0b3IsCsKgIMKgIMKgIMKg IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIE5fKCJidWlsZCBhIHRlbXBvcmFyeSBpbmRleCBiYXNl ZCBvbiBlbWJlZGRlZCBpbmRleCBpbmZvcm1hdGlvbiIpKSwKwqAgwqAgwqAgwqAgwqAgwqAgwqAg wqAgLyogVGhpbmsgdHdpY2UgYmVmb3JlIGFkZGluZyAiLS1udWwiIHN5bm9ueW0gdG8gdGhpcyAq Lwo=