From patchwork Sat Jun 10 20:21:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275040 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 D90ACC7EE2E for ; Sat, 10 Jun 2023 20:21:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232148AbjFJUVk (ORCPT ); Sat, 10 Jun 2023 16:21:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232279AbjFJUVe (ORCPT ); Sat, 10 Jun 2023 16:21:34 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B05E63AB3 for ; Sat, 10 Jun 2023 13:21:28 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-30ae901a9ffso2674369f8f.2 for ; Sat, 10 Jun 2023 13:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428487; x=1689020487; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=kfh2VMkOGYUvE4AgBkzqydrO8d9hs/sP/UEVum3BtSI=; b=Er6HbmG4iqyD5Md5vjMVbocKSCHnFpF0fsQmQizZFU8O3YkvueTcQh/kaVNwsnlZfr z2Dlx5RybVjgJ9FrQb8z0DXc5uDl/NzScdtEtzrSBwhS6RH51Lp/jZuZQmxXXXT6jKwj DyQfGZf31Vb1Ts30PVZhIlnphWuC/H3oQSAuMcPXQuhNP3HOizCn/l8S+Rtyh6KcsLsq icHDZOyA5H+unxEwM/Ew2jZlTWX+6JBZDHdacFj/o8TbjqNHdOSESBM+F5m0/zMMyFLf Kf/CWZz1hEYCksymmoWZaZgSEwsIFT8yJunbmsZmUFpJ6eNitYMEL5oTxSS8B46i6nVI aZyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428487; x=1689020487; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kfh2VMkOGYUvE4AgBkzqydrO8d9hs/sP/UEVum3BtSI=; b=Q5m0S0bl+N5vL6/3140VG6PvxgOs/MFFx3WlS5VbyZtTyvWuoaglEaH3RBCyjIPdyN qOG8+otKquhJHlEBXtPAU96CmSbphqeZvhC/92aqaEzwz5tz2W7BOq3gA2+Wn8GNWqU1 R5KztGWj7Isjg8nK1uKFjqN00zHZ3fFcLKq+VPwFAQMdHZKIaGpoRAAPAX0+gzrm+/BO 791FGxRkdqE/Z8E/0Wep3lpOE1XngWMEWoxdPGz8HGf0ba4BBG+KmGyE7ueUM8cLEDx/ yd+BoKdAKBkRGMxWbyC0WL0+f6MS/PtTJbx1w5FMzN7J+vZeuOODiWzliLrLNGfV6s2/ ulDA== X-Gm-Message-State: AC+VfDyBPDXnErrWPSqQYzslRZ776vLE3Lanl5lMWkaim/XiJLOcWfAG Zjxdztqv+bYIy+ULDcEfxb+/zB9wGak= X-Google-Smtp-Source: ACHHUZ6P4ZsNNV661LF7tqG+7u0C9o+khctd+MloexmpTgkwuhKtM7cQoOcNqXKcNSxKqmGE0Udo9Q== X-Received: by 2002:a5d:5486:0:b0:306:2c5b:9da6 with SMTP id h6-20020a5d5486000000b003062c5b9da6mr1828222wrv.56.1686428486870; Sat, 10 Jun 2023 13:21:26 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i1-20020adfefc1000000b0030647449730sm7975030wrp.74.2023.06.10.13.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:26 -0700 (PDT) Message-Id: <4edabc7f15c3ad55c911919bec5a406bb48ad0ee.1686428484.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:00 +0000 Subject: [PATCH 01/25] completion: add comments describing __git_diff_* globals Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Add descriptive comments for '__git_diff_common_options' and '__git_diff_difftool_options', so that it is clearer when looking at these variables to know in which command's completion they are used. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index dc95c34cc85..90fe292459b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1733,6 +1733,7 @@ __git_color_moved_opts="no default plain blocks zebra dimmed-zebra" __git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change ignore-all-space allow-indentation-change" +# Options for the diff machinery (diff, log, show, stash, range-diff, ...) __git_diff_common_options="--stat --numstat --shortstat --summary --patch-with-stat --name-only --name-status --color --no-color --color-words --no-renames --check @@ -1757,6 +1758,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --anchored= " +# Options for diff/difftool __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex --base --ours --theirs --no-index --relative --merge-base $__git_diff_common_options" From patchwork Sat Jun 10 20:21:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275038 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 BBC7AC7EE29 for ; Sat, 10 Jun 2023 20:21:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230403AbjFJUVm (ORCPT ); Sat, 10 Jun 2023 16:21:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232115AbjFJUVf (ORCPT ); Sat, 10 Jun 2023 16:21:35 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99C2A3AB9 for ; Sat, 10 Jun 2023 13:21:29 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-30af56f5f52so1940596f8f.1 for ; Sat, 10 Jun 2023 13:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428488; x=1689020488; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=oGhLXXBoQ6UI1vHMOyV7YwVlIGSV+5Rfv8inY3ASxdE=; b=L2VHsGXiCvxUsBDwlFa2dTVOjbhQoZtzVazjo8sHiCjEOOvXewNO7ddFcLRGvYi4Jm BK5E0/+cVvdN5iGqrbtQ0+gTaS2lpXaQU9GgfjLFuLVV+gjQoEMp5PcxXZfEp/gdGZVR 6TssTSH/QacRkcbLyLtUFgnyV+nsaX5SK4KHpYsitnevoA5Sco4lmF4IhgyfUr0bIMDn v35ALbZpEOHsWYAmuMk4rZRpFDcwMLlXVYlcD+nfxOZp9s7cBD83d/LdnzxiRIPEod2I mnE8RJK4xJDBi/C6I7fUwviRYZxOeV/2Jnj1xkbNmFrJtD3pP/oiCMfjpaQef/N6QnPs pUVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428488; x=1689020488; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oGhLXXBoQ6UI1vHMOyV7YwVlIGSV+5Rfv8inY3ASxdE=; b=KgvhnsM5ZMkUfZC1Vk+7OGQICK6C1vln/Ps73Bv6eFSZTgQKRLbyQKIyam7Er6iHaO 8JfGDMInSqDoXUUkpn/3vNeLL3xo2kxZuT88C1XoUjGVUzVDRVKMmwJVvBI7DYr+E63i H7jTaIcuMjqVjHVS8Wf06z38AaiaNsmryS251IGozhTvpCt22dBtYbNghUJBdf2q/j5F MgxKDN4E2nGwnGTr5vLpsutR8u3l6uRcBfCyljRzbRCGl8ciQrKqSVApsabMN/VIcl9K rez55/CbR/cv3Pe/R8IAcbkP/DSN8VGAclY1jz5UNedD/iMj10QwlCXdaxihhWie9Ds+ rKBg== X-Gm-Message-State: AC+VfDxh9RdO5PLl4Ri6rKFn2/kz/uoDFRZZPCh1X4JVEvxobI2a0d0H Ju58PE4vF3pbwuwrZNyffAOypggdyL8= X-Google-Smtp-Source: ACHHUZ4bXCerI1ljQnjZsF1HGSdw2ZgNMCx+Me/ZKZPwNF7A1fjQ5qlDVgVRnIpuTrbdAPNYR50Faw== X-Received: by 2002:adf:e792:0:b0:30e:3f55:ebcc with SMTP id n18-20020adfe792000000b0030e3f55ebccmr1723119wrm.44.1686428487562; Sat, 10 Jun 2023 13:21:27 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b14-20020adfe30e000000b00307a86a4bcesm7912832wrj.35.2023.06.10.13.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:27 -0700 (PDT) Message-Id: <1f3c9e8d417d2c9f16583da7609e8f322059f1f1.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:01 +0000 Subject: [PATCH 02/25] completion: complete --break-rewrites Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 90fe292459b..f07b00b9c68 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1753,7 +1753,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --diff-algorithm= --submodule --submodule= --ignore-submodules --indent-heuristic --no-indent-heuristic - --textconv --no-textconv + --textconv --no-textconv --break-rewrites --patch --no-patch --anchored= " From patchwork Sat Jun 10 20:21:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275046 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 23E14C7EE29 for ; Sat, 10 Jun 2023 20:21:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232378AbjFJUV5 (ORCPT ); Sat, 10 Jun 2023 16:21:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232123AbjFJUVf (ORCPT ); Sat, 10 Jun 2023 16:21:35 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9BC635BC for ; Sat, 10 Jun 2023 13:21:29 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-30ae901a9ffso2674383f8f.2 for ; Sat, 10 Jun 2023 13:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428488; x=1689020488; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=+M0/92IfMNu3+ZNKHyADTtuyGLmFRsLqMO6az5RJJ1Y=; b=RUyM1t1DlRzDPeYPqea23rBBkxjaihf8t5+1moonqBay5ueTyD69p4knYPsvkYu1fW 1nj6hEDCcpD3GPS1IW65sUUIUAvUy9/3IiUQ5R4+BJ+SXoYafrMrW2XrswLuFgJz0baj vHB2S9CKbOp3gUlr8CiGplgJyD+03MJtVrEnxv3xwzsv1w0lrU9YIrvrLHQX722FzJvd QaqbgnWmI362BV61zBR7XbytLAVJEyREvsNUX6vJ10TTQGPcai7vmHK4LhI68xO4sEfQ 9RmvyI4CzjJ9xhNKFBQnSh8levUvg37xhQjLPCveDA0aNttAmUXRmntryq2vbO0VgIX+ nNNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428488; x=1689020488; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+M0/92IfMNu3+ZNKHyADTtuyGLmFRsLqMO6az5RJJ1Y=; b=hsGcvyErDscN6MQFZZJesXDafvWM48dBhC8h4AMgSCet9MCZXl5C/jBMciLGve1LMF 4BTdNY21C9YuV6S2KP8pzdZe6BZY19SgQ6aBbSPlKYJWwhdR2e7BOKHY4wIlZ6hXER3j ODEdvtwalzbdeAAGQaHf9OO7smqo2H6M+vpfPqzOAVBV1S3InWGOEWdVldzfn5vDPt/A uFYLh749nFYGpFZc7prBoz5As54g1yLaGWATmKVHypQri2IT523gnlZDjb7Kf8BEoWMO 2lhMLZ98hAEls72xhch14OZVgi+EkDNcG9ghi+5AnqZFFlWDbClfVWutXrJFeHtaOP60 FJiw== X-Gm-Message-State: AC+VfDxm29WNf7b6+LJ/mhYObpzjghlZpvnEKypr0dB/D/fjd5rA05/5 SiwVdQRLycW3eRBjZp8/395F8mqs+u8= X-Google-Smtp-Source: ACHHUZ62Eqo25BwoZ95UrUaZS6FFf5C023V+7TQFyp2ooo2X7+Ez+N9Ob8COhrKWkEWPu2MYy9beqQ== X-Received: by 2002:adf:f842:0:b0:30d:1df7:f145 with SMTP id d2-20020adff842000000b0030d1df7f145mr1779524wrq.64.1686428488036; Sat, 10 Jun 2023 13:21:28 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v13-20020adfebcd000000b00309382eb047sm7931033wrn.112.2023.06.10.13.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:27 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:02 +0000 Subject: [PATCH 03/25] completion: complete --cc Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f07b00b9c68..b61c54e37f7 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1754,7 +1754,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --submodule --submodule= --ignore-submodules --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites - --patch --no-patch + --patch --no-patch --cc --anchored= " From patchwork Sat Jun 10 20:21:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275043 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 976F4C7EE2E for ; Sat, 10 Jun 2023 20:21:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232202AbjFJUVt (ORCPT ); Sat, 10 Jun 2023 16:21:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229542AbjFJUVg (ORCPT ); Sat, 10 Jun 2023 16:21:36 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50D483ABA for ; Sat, 10 Jun 2023 13:21:30 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f7f4819256so22113365e9.1 for ; Sat, 10 Jun 2023 13:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428488; x=1689020488; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=b/BSvPlpPQ+gzO2pSRwkDZXAM5xHHZSyB4ue8FP/Dok=; b=d6lQ7kwgHA2ojqW9k3bRqpFdg44AQ/Mk27o3IZgh4eF7KElpJuX+1UGyplr61qCKCL gI/dLud7Ls1DokugX+FWy1otmUdPaQf6KY266Cu9V3Ocp6edGrZeOxOTsenkRaWk3CL8 rL6y3//1AtHoWG+Bn+UtRhuv9uZXeQmsMwcvdTeUD7EVQ9kxGxKNCF/66FRHjfw5+C6d iS+XrCFv5ERu3MOaskHxBJ/37NXC8vCeM6+L4Mx/2UHPTZ7A7tR9xpibJazRUk/bfLW+ EnRQsSHmjtcibBxZEU7QrOdHSCC2h8mCLig8o5XvSrWB58ociRqRNChHDq2GA4ooboLW RODA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428488; x=1689020488; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b/BSvPlpPQ+gzO2pSRwkDZXAM5xHHZSyB4ue8FP/Dok=; b=Zha2kF6FLzOBS8DizuXQNNym7It5vLTwHjkvmTyucHFzYWSBfQKSfpcO6nl1spUZ2m Subrc8om0Zr8kQXGWRxS4KH3dB0BO0dp35+t32SFRdE38yXD7W6WWqaH4YXqEcYzyA6X vqZv1boxVaYalgKg9iwSe1u4R8JMG3iVA6d34Qn0SEKPJazOLMqK2mW65prMVyfFBg2n 8I7XPOr6Qgr89etksAnyaeJrKPvs7H0qJquReTzPm9osi2bNwH3vRWFl9vsIcNzNGGNH mTAmsktE2CXj+D+x9gNhsHkHkZOAsHhQ2tSX694ZF4B6hpa7hVm7dq4DXlth6oE2rk6S NOtw== X-Gm-Message-State: AC+VfDxDo9/gfZm46JdN+ZP38C+eii9UPzMUZq8eePoJmqjpY7xTrohe P/V9d507lA9zk+jSMYYItZtGNiVXX4w= X-Google-Smtp-Source: ACHHUZ6eYNMpAfLxGMSTux9h21Av9V8mhJmE7oacvRDT2gN87/7p/CZNpNT5gfoFxiRxtANX92xa4w== X-Received: by 2002:a05:600c:3786:b0:3f7:f45d:5e44 with SMTP id o6-20020a05600c378600b003f7f45d5e44mr3553581wmr.32.1686428488535; Sat, 10 Jun 2023 13:21:28 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 10-20020a05600c22ca00b003f427687ba7sm6516377wmg.41.2023.06.10.13.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:28 -0700 (PDT) Message-Id: <51024ee2f2c4862d223e10ae4f193b8e0aeb1c60.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:03 +0000 Subject: [PATCH 04/25] completion: complete --combined-all-paths Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b61c54e37f7..58ce64de9e2 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1754,7 +1754,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --submodule --submodule= --ignore-submodules --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites - --patch --no-patch --cc + --patch --no-patch --cc --combined-all-paths --anchored= " From patchwork Sat Jun 10 20:21:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275039 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 63988C7EE45 for ; Sat, 10 Jun 2023 20:21:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232395AbjFJUVo (ORCPT ); Sat, 10 Jun 2023 16:21:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230381AbjFJUVh (ORCPT ); Sat, 10 Jun 2023 16:21:37 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A97543ABD for ; Sat, 10 Jun 2023 13:21:31 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f7f6341bf9so29443245e9.1 for ; Sat, 10 Jun 2023 13:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428489; x=1689020489; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Mkt0tgPGKfg5NkOEOLf6K3kF+oWQxLyWGbxdvLD95AQ=; b=CJQQ8lKkQZMM/bjNNR3HY42G1dCfOtSK0tDY9bvuERetom/PtH6tHvElGtNwCk3FXf zfWPzS00PlO9qB8fAdEHX3XbRQM5aEg2KqVKYqhq8JQ6Ro+hz08iPwEwSPHyAc9bj4pI vRPz+spN76eHm3v5K6m+l7jUZ3hRy9FcNW1p4svXX/dR45uG6lVZaneX1CAShiwSMnyk BYMIFLUSjFF7Kpwk+LBj+qrRaNhnmuCsimeGZIg/rZX8sJGcfB5oNFSTLPsbpBHO/pUz vFB7JsddQyQQCVKeAz5vJ+wpcKsQZvKndtbpzNzANOSpItKpUrDFK1LBbGoOgwOG3JTh 62Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428489; x=1689020489; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mkt0tgPGKfg5NkOEOLf6K3kF+oWQxLyWGbxdvLD95AQ=; b=LucsTmu2sIEPDLCNbD+4jzIyMwFexKXlnhil5xfqBm6prfhysxHjzLYbYx+pJlUVLh hZObeQzBbgBG547TcXffznIgwo7z/wzmGzFgvsxmaAeAm/UAhneT4VeoLYUmMKCpeIYO KBBSylOY/ko4gr/qfmG/KthjstlVXeY/5XDLnbMGeQsLkSNeWOJD4M2uSuBjOFb+S3In hlwO0j62d99FInWdoOXZ10dOjrNHe5uX6nD4dSnkAxzU6I5w3kkpttTFa01wOHgp6Ad+ WqsAGq9xC4eVT3mdyJvopGmOrXbdMzt/ZbFdVw2c1nSvZAKTRD4JP1RZbR+dk9aT8oz/ /eUg== X-Gm-Message-State: AC+VfDwQF45mDlh5tKSQsrFvMagDjcbimROEH8jD4wuex92Pfuut1KsL J5oxaoObZC7XxtteQw5QHhCFezYsUYA= X-Google-Smtp-Source: ACHHUZ7w4AXIuQ2HWcB63AghwR1oV+I5G3YDIiGAHSCrVl+GicOQ64A2HKvjGJ74wUqdygIXYeBOTQ== X-Received: by 2002:a05:600c:295:b0:3f6:af2:8471 with SMTP id 21-20020a05600c029500b003f60af28471mr4008199wmk.26.1686428489360; Sat, 10 Jun 2023 13:21:29 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m9-20020a056000008900b0030ae499da59sm7841714wrx.111.2023.06.10.13.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:29 -0700 (PDT) Message-Id: <63d70d645e25a2e7f9d3dfac7f6b01c3bd27fd7e.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:04 +0000 Subject: [PATCH 05/25] completion: complete --compact-summary Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 58ce64de9e2..4c43d13eef4 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1755,7 +1755,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths - --anchored= + --anchored= --compact-summary " # Options for diff/difftool From patchwork Sat Jun 10 20:21:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275041 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 336DCC7EE43 for ; Sat, 10 Jun 2023 20:21:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232125AbjFJUVp (ORCPT ); Sat, 10 Jun 2023 16:21:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232238AbjFJUVi (ORCPT ); Sat, 10 Jun 2023 16:21:38 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 109E43ABF for ; Sat, 10 Jun 2023 13:21:32 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-30ae901a9ffso2674405f8f.2 for ; Sat, 10 Jun 2023 13:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428490; x=1689020490; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=8EuEC7ZPeXKOGDsEdiD9s2S26+adBCwfD9y21ZQNkMw=; b=rAbbzOQ4at98Walc4ogYwqnl1f8Fw+1Frd+hu5F7/VAYhGMwFjBZFgq6Dn40e+N7JW 9XXuhSOKVZrLeUaxCPimNTv+59/h36/Hs7pVQDNUP2znr12SXmCDAYbD1PO2tZ8BspCh ElwYmQOp3rPQSqv5jj5xS8uDUdjSC8gSci/XfRrLSpkpgQZjKLU9fMsWqYTdd1A/w1uu gzkAqZsOrYSBJ0fC4I7cm/GJMBuZyf3cMELUdzDNUdyGi8l4PAVs46Ejz95GWQnD/wEk tmjlxHnK2R181iJMH/cQH0iFMTDrIvplWhu2Bvlq+8nLjs0NHrBMJpWLFPLuLgRbeTdz gpaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428490; x=1689020490; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8EuEC7ZPeXKOGDsEdiD9s2S26+adBCwfD9y21ZQNkMw=; b=RBEBlx9oybAVERlPyc3WdbuQkJez68QsgTkclncWT0vIKdDyFpQ4k6wtikfowV+HaR sNx1KzaZBM0yHhCWO7+0lgPf8GYsE9xbAJDkDn7lsYICWywbaTsPeN0v4D+ae5k+V5An 9f9j1kQwKX3bVyxB3UQ6K8oswi9aqhTvBV3EdqAnvMtJpgJOWYCXpwUr3DUhWs5BcdSM JCr/vucdelPxQt3Qe1wF61iw84MRn+ZYMo4lZcg881zoWp9IyARQCA8CBA60L//I0QDl aQvYHWlLGUtxo4cLp7IyOZiZYvOYZr9IbKJazZjlMmxO8tbtNezImorEVcQfrGm1qa72 y5lg== X-Gm-Message-State: AC+VfDy1lnnekpTpAn4WzdW4SN0HryA2D6ENPCwcMQzLJ3i5+PKSmlgq GAKMGSQQkMYuw8KrumfrVeUtGMkMKcc= X-Google-Smtp-Source: ACHHUZ7K3ium3fDQVTjSLIfb57MbhCmrE8QUmst6s+nN7zCod7BFq0Q2/MMC8wFfF6kDQ9ymnCCbXg== X-Received: by 2002:adf:f00b:0:b0:2f9:a798:602f with SMTP id j11-20020adff00b000000b002f9a798602fmr1772562wro.48.1686428489888; Sat, 10 Jun 2023 13:21:29 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m6-20020a5d6246000000b0030e52d4c1bcsm7964935wrv.71.2023.06.10.13.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:29 -0700 (PDT) Message-Id: <7296a3a8c9da5287cca85c61af342dfc647fb2a8.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:05 +0000 Subject: [PATCH 06/25] completion: complete --default-prefix Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4c43d13eef4..6af04932a0a 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1750,7 +1750,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --raw --word-diff --word-diff-regex= --dirstat --dirstat= --dirstat-by-file --dirstat-by-file= --cumulative - --diff-algorithm= + --diff-algorithm= --default-prefix --submodule --submodule= --ignore-submodules --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites From patchwork Sat Jun 10 20:21:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275042 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 5907CC7EE2E for ; Sat, 10 Jun 2023 20:21:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232515AbjFJUVs (ORCPT ); Sat, 10 Jun 2023 16:21:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232285AbjFJUVi (ORCPT ); Sat, 10 Jun 2023 16:21:38 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04FE03C12 for ; Sat, 10 Jun 2023 13:21:32 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-30e3caa6aa7so2909747f8f.1 for ; Sat, 10 Jun 2023 13:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428491; x=1689020491; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=con+oNf6coEKJAsHN/zehDywaFXb8TeuAbNFWjVUlrU=; b=j9EbZBhPBITAnM87qD9fnP0XL1Y1FjYfghVZ77jVFoH5gkJjKNolbbaNsMASea/414 d/kW4yJ7LeaRX2nmItRrTRExpbcPJuBG6V/L0eUoT4Q0wBiq9SQg2++FR6A+sWp1GoCg fendjvjaU+W4qAgK46MSLtmVZZgbAJkB425pzdBRQH9/qvkgGRcAwBTmqqB+rvEz89MW o8a5MK/drhSZw/VX1nT4gLN9YNNq8oQ00L3L3zncLPjQDXpcDbgOlOvX56Cct4ko3dUe xipmaTs21g+oGHDgVnIWpD8T+ROEPkkhL4/oGGEDXLrRagIHZmK0bB8gjZp5/OF1Pof1 tILg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428491; x=1689020491; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=con+oNf6coEKJAsHN/zehDywaFXb8TeuAbNFWjVUlrU=; b=AK2EvA9+PdeReCVM0qZPjK6LhZixwMaJhIgvotGH8Jf4644iCjrLkEodkwm+S5PmFr 9m0lF9j9p4UiHwDvLjVyFyufw/79X9R0vKq+feOOIRzncHGeqORz9078Gz8KHK5EQtMY YHb89RxrhxqnEhqR3f0awH3w9oMBi9OUAgEdDj273JF+I9zZSOETgrmLwBznYo74hfks 5uvT0Y+vsQsGGn3QCJjLh4Eo9t4mazo3S/xhK/ZVYemRSsrFhuOVvSJ81vBzXBiozmMm EhGQR/wTVnxvxiHujRzerjfUsls2SUQ3f/svSHhh2woiedn+aJrm9CDl35UPNvVVja1l mM5w== X-Gm-Message-State: AC+VfDy0mUtngVoz6Kk0QWIzWqcIYxiEt05UlqwlZlWvD+rzvC0SsXAY OfzLuYXQnzeRxshGLNtov8C+xvgJ0sk= X-Google-Smtp-Source: ACHHUZ5Ck6aIh0YhJ+auWSYLno4VcOL6YT7XzEeDeLDvX7wWZgYorL9fG7R/aEuVoq7P9t8FGm3V5Q== X-Received: by 2002:a5d:4c4f:0:b0:309:49e6:d1af with SMTP id n15-20020a5d4c4f000000b0030949e6d1afmr2098585wrt.2.1686428490936; Sat, 10 Jun 2023 13:21:30 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d17-20020a5d6dd1000000b003095bd71159sm7956270wrz.7.2023.06.10.13.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:30 -0700 (PDT) Message-Id: <1f9b213cee5a4c6325c7fa9528180e46aab7805a.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:06 +0000 Subject: [PATCH 07/25] completion: complete --find-copies Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6af04932a0a..dd6e12ad8f6 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1740,6 +1740,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved --color-moved= --no-color-moved --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= + --find-copies --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code From patchwork Sat Jun 10 20:21:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275044 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 4C42DC7EE2E for ; Sat, 10 Jun 2023 20:21:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229453AbjFJUVx (ORCPT ); Sat, 10 Jun 2023 16:21:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232347AbjFJUVj (ORCPT ); Sat, 10 Jun 2023 16:21:39 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 773283C1F for ; Sat, 10 Jun 2023 13:21:33 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f6e4554453so21566275e9.3 for ; Sat, 10 Jun 2023 13:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428491; x=1689020491; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ztzLL4KgmrtUPgRMDMXzL1umxszvJ1+RIMd9x/Qs+L8=; b=i1nTHzU6qo+mhtbvsMinnWW4M1L3qujEs4+Ldaqv9DxA1NpDGlrdPCeWjqoQZmz4b/ JNtpB2Sfk6tViPEfHt5TP5lQOjbMzH+m2kparCtMuwQqQk48l4yoW0AGaYUiHNwaguWu S2tGQR6Zt8B1bnqq4uEuIBrm24Cq1cdbc/su+3KY+CIf4EISSzwHUm4fkbd7BxY2J3EH U/qgEDgLq0mfjbO0iWfZVLn6vbR9kCeqh0Dng+DoHHJZoYcoceivNO6fQ3jN30PAXp1v IUuGdHer/fCWv6w+eeuOWVY/LdZLAkwt5JmhEcPv9T/gEscnNYqW/gQMXes7ZyYBkokl SEqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428491; x=1689020491; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ztzLL4KgmrtUPgRMDMXzL1umxszvJ1+RIMd9x/Qs+L8=; b=H6OOoMO5dud0F7nCLxpv65BZxpINCvMjjv6FXDIk281XS6HQwT5NOYRLl7dR076mg7 3RaC2hrYwM0Rg0oK2RkhCPoXHtO6CnUJ23llGzbEpTgRA+Jv/2pbm40m5LMbA7Hsc9po lJct/UdMyIQgbjumfiy9+AACBIMXvk0BM3Fzsn/Wv9pBdt/ENhZK8lAQf5dlBDObuD2O hDbVT8J9h9p1WAdzw38uXD7/RAJC+41i19t28NxUtF0Kr4rGyzlKnWYvIl17ihz8ZI7W uR1nSurT2iY5d31SMWHd1Q/MRxT8mcvbJTJMGaz8icQfHGFEv6U91kCiJKKWCLWV8LlK S50A== X-Gm-Message-State: AC+VfDyM5L0ptTw9scUDXnru9rr4jgy5XkUQWCo1HQq3/GORih5rk/UL vgglGd6ML1F6deHSqQE3+c9I0jPvP0g= X-Google-Smtp-Source: ACHHUZ4ELcwwkVWVd1PFyCj9gEeLiyyu0YJb+zmZGkULQZ8bU59igEQ5lN9sJylxzdSwcpXsZbAaRw== X-Received: by 2002:a05:600c:b44:b0:3f7:e463:9ab8 with SMTP id k4-20020a05600c0b4400b003f7e4639ab8mr3201252wmr.17.1686428491622; Sat, 10 Jun 2023 13:21:31 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u8-20020adfeb48000000b003062b2c5255sm7903950wrn.40.2023.06.10.13.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:31 -0700 (PDT) Message-Id: <53b1c348f822ca32228cdb0f40b03c9ae9ec59c8.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:07 +0000 Subject: [PATCH 08/25] completion: complete --find-object Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index dd6e12ad8f6..392fdbedd9f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1740,7 +1740,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved --color-moved= --no-color-moved --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= - --find-copies + --find-copies --find-object --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code From patchwork Sat Jun 10 20:21:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275045 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 42FE5C7EE2E for ; Sat, 10 Jun 2023 20:21:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229445AbjFJUVz (ORCPT ); Sat, 10 Jun 2023 16:21:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232378AbjFJUVk (ORCPT ); Sat, 10 Jun 2023 16:21:40 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 294E635B6 for ; Sat, 10 Jun 2023 13:21:34 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-30af86a966eso1965173f8f.2 for ; Sat, 10 Jun 2023 13:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428492; x=1689020492; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=+2WpL2LnEIDybO0wRqkmHT0eENwkULnxZnfbhvEDvYk=; b=H/atAWVx1+oVt7VsXtQvFTVy5L+UKCegjrf3+ccGWsUp/6Lj1zra8InUfL5RTDrFgH 35oGWD6x1PdX63zBXrTJRIsmxNltooUfxLp+xos9Rfc1EzELJfXOeKyhXuVbkKc3r7kG nE/5XfEPzGPZpue4VKVhLmpN10v0kivbXW6XPwznkVkbkZx9Z0Di+I9BntWBv4Nd7BJC KB1pTTRBzaOygYV9k4HyH2rrp0i/1u7/ewBMuqBmXXISLalBbylNN7T+L2hCgZC6soj5 7dfwxGmagtCtvuJTpYqM9ygnCRiQfa1Siv5PCO9PBCx+r4zAh7X2tKu0L86RJZDQeGfg n7cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428492; x=1689020492; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+2WpL2LnEIDybO0wRqkmHT0eENwkULnxZnfbhvEDvYk=; b=ICJaHpfgP2DWOqKODdibWEr0uVJiTSWOfepnMLZu3WaMHe+9CfRsHL82geWy3EPxbT 0T2dfc5tOomPmwDAdOuGM+BCsD29n1PxkurSJJhRdfCB81shWZrePGMoXnh/nQGsCuaT uAaAECzOUPoAQ0LFmvT4KDkyRPXU2FXK7U7xFJ+/sWXODeDTSNX8RUk2o4rN8/qst7Yo wy11DZSTeArnZmTbg9J85LFrBBEZWV/uJjVm+lD0SXPoyHo0VEvHxZpWZ7JuM8f0ne8Y INL7Pqud/7bAlF3zQ8GkZtAHfZgI4jAFqc18gZHBJ7OMOVJF9nasbH8gTpiNQFn/gnea Nsdw== X-Gm-Message-State: AC+VfDzbgxbDtz7Z8yF+ObPVGi5oQd8j0utFT2p/gIcUPTViPymW7CmP rMZkuHsLFQxBWd6W9R47AZt1x/w8nwI= X-Google-Smtp-Source: ACHHUZ7nbA5y/xHUdLLPkMschNZ0iQWfpZKk0GrJsumH+kHaSxxTxZ64N5ByJ5Tq9O9vaK4bRojIMA== X-Received: by 2002:a5d:43c6:0:b0:30e:4515:1529 with SMTP id v6-20020a5d43c6000000b0030e45151529mr1199942wrr.37.1686428492346; Sat, 10 Jun 2023 13:21:32 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x19-20020a1c7c13000000b003f7aad8c160sm6544101wmc.11.2023.06.10.13.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:31 -0700 (PDT) Message-Id: <053f9e8620aa369f04eff8f1235eb57d15fe8755.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:08 +0000 Subject: [PATCH 09/25] completion: complete --find-renames Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 392fdbedd9f..0fa86dcde6f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1740,7 +1740,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved --color-moved= --no-color-moved --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= - --find-copies --find-object + --find-copies --find-object --find-renames --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code From patchwork Sat Jun 10 20:21:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275049 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 02048C7EE2E for ; Sat, 10 Jun 2023 20:22:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232399AbjFJUWC (ORCPT ); Sat, 10 Jun 2023 16:22:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231200AbjFJUVl (ORCPT ); Sat, 10 Jun 2023 16:21:41 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E349B3A84 for ; Sat, 10 Jun 2023 13:21:34 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f78a32266bso29570275e9.3 for ; Sat, 10 Jun 2023 13:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428493; x=1689020493; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=RknSMSJ6jkl1S2ky9jZa5xqSyZHqjLkO+0dQYVSmL5w=; b=Nj70qjYMryEDDfNnkxk0Ta3zTn9b1ebuqM55KHtclRvm6C9AHoaxPoYX61nMA5KHbg MyHV9JtFDJLfkp/K8Q+5acLR3J44yVi9h1heHStitqIuTq5yoQGjmHndhsEWIorPFgiD kI2YVA5prPaYit7JSzbXS0CbwTkSmkzclrUPdTkGiMYI0TYWLXz9Gf1RcFmziEUIpy8D h6IoDbKJHrp8xyZ3WUoZ6fiJAHG/O+QBlyILIj7aujYFO6Kmur5Gfl2MysCMXddh7aXQ dyt22N4se4hLq+e6+9WewPjLFtKe1DPuaPZc5kX16YG/CWGp10F+YOelUSgjV12w8nhi bIjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428493; x=1689020493; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RknSMSJ6jkl1S2ky9jZa5xqSyZHqjLkO+0dQYVSmL5w=; b=Kk6K3lcKmu0a09vxkz8Zjdy+FNZXXyo4J61acJS3bYqwO2tkIfiQb7Ccz4Xq6kNUSW 8xnxuXIiKkP4njkKlo7+B7RGiKCNKRcI87u4MKsIVFHWJ6FyqgkesA5ax0O8vOnAAI+R Kd7CPEGI4lEbq4CRtVl6+0PcohTIaOUGp/L8dFMJ2TL4ePJPsJOP4wYskQyzuyk5GHDy IHRHmlNIID+Stqyq4svuB2PNd+JuL40+AllalyhAZ7tWKK/gno1S+kYzdkbQoyAQD02o as/a3q3ZWLjI+zjwIGhyMzmZ1R+sflStSZUWp4C2xP0vFAd4Ei+ZI8XmDx8hi0PRtyCl aMng== X-Gm-Message-State: AC+VfDzP/98S7eFpGwnJ4FN2UliUYhm5FEFrgomNc9HGttNLqJKfvPZ8 mSSc//OZJOLHj8/xyptryKMZUjbwBO4= X-Google-Smtp-Source: ACHHUZ6KB9BAAw/Z21in+ERE4X8XCXq0JFho58IIIRVU4KwjygVDvt/eW8tgCDLdtmuXjA1NQ4+uLQ== X-Received: by 2002:a05:600c:2310:b0:3f7:4961:52aa with SMTP id 16-20020a05600c231000b003f7496152aamr4121883wmo.15.1686428493130; Sat, 10 Jun 2023 13:21:33 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 16-20020a05600c021000b003f7f6827ab9sm6541490wmi.31.2023.06.10.13.21.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:32 -0700 (PDT) Message-Id: <2503d990e5c7d1fb5bbf06493951204e7c00ea09.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:09 +0000 Subject: [PATCH 10/25] completion: complete --function-context Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0fa86dcde6f..2610a55487b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1746,7 +1746,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --ignore-all-space --ignore-blank-lines --exit-code --quiet --ext-diff --no-ext-diff --no-prefix --src-prefix= --dst-prefix= - --inter-hunk-context= + --inter-hunk-context= --function-context --patience --histogram --minimal --raw --word-diff --word-diff-regex= --dirstat --dirstat= --dirstat-by-file From patchwork Sat Jun 10 20:21:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275047 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 7D2EEC7EE43 for ; Sat, 10 Jun 2023 20:21:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230506AbjFJUV6 (ORCPT ); Sat, 10 Jun 2023 16:21:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229735AbjFJUVl (ORCPT ); Sat, 10 Jun 2023 16:21:41 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 817D935B0 for ; Sat, 10 Jun 2023 13:21:35 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-30c2bd52f82so2903950f8f.3 for ; Sat, 10 Jun 2023 13:21:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428494; x=1689020494; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=vRxPtMHjcUedxPPl4bnw9YSFm+KCnkrh/mX3WuAVtFk=; b=HX2tXEXZJq0ZEEFD5Kgfx1OM0cuM68f2sxMkgd9GjbU19j7ESrV6FPf8ehTX5pP1qM gd2ctq7AI3Jx1+qiqlbW2SvuCGssB0jHX3XQ+JTWmLVXkOD50ElkOdJO24K23mSb4rDx it/XM/1HPVO37ErKy+RqY2zdqeOgjRO9rr3CNl50FEHpGOVLTYFzpDiOEUtFKo2ykL+0 xkc4HXzooHi2eMKAF41A/Jf23Y6OzaG3bhszUxWoXRZjhWYFboyLYthA7qhhlyXpwExx bpOGotQra+wMLGYafP97FoM7ng+5zkL9KOxxwIY13BuByZlDMkb4l3PW6gqMrDfK/hf2 JV3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428494; x=1689020494; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vRxPtMHjcUedxPPl4bnw9YSFm+KCnkrh/mX3WuAVtFk=; b=AnT5UlfueHZqHmYVeE61md9PDfYMrYMFg4jQ3AWY7D9YRMGA//mUAmfOa4NSiJ2h0A eh89yk7qGu2Op3iej3F8yDN2MxaVL6df3ZG2yVjXDVJErwASGpQXkVK9ucMqoV6wHrW8 E/htc9d4NFfFQOxD2S0etxrVSBcWLdFt5ASoHP+JS7m2jbdjTSkhxW9wI51C+CoNN9pj Vs7/xiWXuREecTuYqInePbnfL4FnQebE2mUeJIdNfZMT1h2P8LNpjMa6bBl4a9n5cSLe 2vhIwo+wb8S8zm/ks5S98l/BQ8eDMKFQdQagTIAbXDIQmHyGMM9NhVIIK1lAKL+8vii4 wZ1Q== X-Gm-Message-State: AC+VfDzcTS9bvHE2swPkPgyB6wbVNcoVtE/XS8Nm4W2SnNV8wUnofBu5 iSdcgZJVa/TFRbMWvtnWtzM0Ive6mI0= X-Google-Smtp-Source: ACHHUZ6A6wD9q7kG5IAMN1MCPlZQO/Va9olUfnMhKfuOIgpjgfK6S2R93LRQeNtj2XOj5W29QTCNKw== X-Received: by 2002:adf:dd51:0:b0:30f:b694:9b11 with SMTP id u17-20020adfdd51000000b0030fb6949b11mr1310792wrm.14.1686428493735; Sat, 10 Jun 2023 13:21:33 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a8-20020a5d5088000000b0030f9c3219aasm5779912wrt.47.2023.06.10.13.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:33 -0700 (PDT) Message-Id: <8bd72945a2ff26c96cecc83abc07299ab51d262d.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:10 +0000 Subject: [PATCH 11/25] completion: complete --ignore-matching-lines Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 2610a55487b..b4d0643b049 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1756,7 +1756,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --indent-heuristic --no-indent-heuristic --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths - --anchored= --compact-summary + --anchored= --compact-summary --ignore-matching-lines= " # Options for diff/difftool From patchwork Sat Jun 10 20:21:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275048 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 31398C7EE29 for ; Sat, 10 Jun 2023 20:22:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232597AbjFJUWA (ORCPT ); Sat, 10 Jun 2023 16:22:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229579AbjFJUVl (ORCPT ); Sat, 10 Jun 2023 16:21:41 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29E0535B1 for ; Sat, 10 Jun 2023 13:21:36 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-30af0aa4812so1888169f8f.1 for ; Sat, 10 Jun 2023 13:21:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428494; x=1689020494; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=yhDEk93Fg0o2c/F17D1rZD+k18ouO62Bw/yMg100lUA=; b=Wi2rfRyhFci9O2eQUavCANWX+GgXqL14DWTEVUUbjw6R2c52UA3sTBBKwWlWdpjeAZ nVIyI+pkf50wad8+5tgD5XEuBkD2uthoYk3XMD333FBSAUjYpsIGdTSDDGtf9wu95Zld 9jfVPv2q6a2w/EZ3Lx8pwmR3DF6gmizda3YSUibCXJFZRa9ODRsrCufT35f0PLEViEqQ g1QT82vYymN+8+9A33eWOO5/d6IH8hBT2Tc59wVaTGTWSLikp+03urJ03G7aY0Y3S7dh tPDP0iCIJUfwW74HuYB+5OGZkKpsCXHTpClenUhnHaVHAdik9tQD2AFs6AmV2+fYEFSe CVUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428494; x=1689020494; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yhDEk93Fg0o2c/F17D1rZD+k18ouO62Bw/yMg100lUA=; b=YYhqLhqH74Phk7flc0eRXLOSWYENCIfs9OloG0jpEn8ONf/WvBIZeEXacOZQqkhQ2t xSCgXtbwHF5rN+OJoR8L4/SZKGX/pI2ybvU5UQqsZgxYusmnLIdpOcGJVIh6PMW9f96B AEBbyjD4es1u3QAHmIdVrPIXKRaTx49a03IbEZEaa/1Vc4bYbBmtZtybWeB7ZGEXcaHd et4harj8DEp+JJX5Ok/qzmDbkoie0SDx7y4xURiB8dd+WuJuAKdoHr6uaAJ/pFK+Jjxa 1w8w1EmbhZzLbcdOVyKVyYabv/su3q77+oooLChJIE1X7pbVwDvQ9LGUWFwP7laBrMhp +AyA== X-Gm-Message-State: AC+VfDwfvDkhUM330I4tiYxRGgzh2c9KYAI9Yo0CX7ImAF1WNpuzjoyP GMc97kdBYe2xyJcbxsrp1mEwKA38GRg= X-Google-Smtp-Source: ACHHUZ5rqs0iSYVxnZVbTVRvvDe1sFFGoiyfcSXjBp3r7SI20YPPOBkZpO2bAcIH+w7s93I1ZCZKOA== X-Received: by 2002:adf:dd47:0:b0:309:43cd:484d with SMTP id u7-20020adfdd47000000b0030943cd484dmr1483728wrm.27.1686428494420; Sat, 10 Jun 2023 13:21:34 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id w18-20020a05600018d200b0030af54c5f33sm7851390wrq.113.2023.06.10.13.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:33 -0700 (PDT) Message-Id: <5d32e972a0c6e099f1d30d4a2a8cbff6e204b09e.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:11 +0000 Subject: [PATCH 12/25] completion: complete --irreversible-delete Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b4d0643b049..e74636ebe86 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1757,6 +1757,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= + --irreversible-delete " # Options for diff/difftool From patchwork Sat Jun 10 20:21:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275050 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 CED95C7EE29 for ; Sat, 10 Jun 2023 20:22:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232279AbjFJUWD (ORCPT ); Sat, 10 Jun 2023 16:22:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232335AbjFJUVm (ORCPT ); Sat, 10 Jun 2023 16:21:42 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4AB63A86 for ; Sat, 10 Jun 2023 13:21:36 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-307d58b3efbso1946175f8f.0 for ; Sat, 10 Jun 2023 13:21:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428495; x=1689020495; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=l05uboNt/LUqosn2wfX53a4vdlSfAxNCZIFmlfGziwE=; b=Xl92pVhJFYN5EaDd29m1NdV6udLpwFtB0rMvL7AKcgiKLk+HBtLODUBgd4q2E+pXH3 o0B7N5+oHbEyy1887o1ob53dgfff2ksbi/u1HFhYmLp/fTinJss93zEpJwcEbrTc8Ptb +L+wnHPBkO3aEEe6XZMhx1gmqpEPs7DV7fRg5uF3X+qdoIw8WMYvkBj/wJaM3PgjVxMi m2Z/vO4P4ZM0ovLNHWMx35588ER+MVGXBv00P/+SkC12Amt6V5cqCsM1JJrhaC4A5hrt GbKqWBP4CfQUrPUGQMD5PZ2lHkvxBqvpSRK7Qbf4VpB6/+oBHyc4Ne8Twkajw1LBwAGV HJ9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428495; x=1689020495; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l05uboNt/LUqosn2wfX53a4vdlSfAxNCZIFmlfGziwE=; b=Tz6C5oGMcff6GWWvZnyDVdbb63YiU32mTft3PdOa7UHdhfnwGsS569nEG8IaK1PKgA /UMCa/39mba68ap8ZyWsPM9fdkVf5Xz04cnxmAPnrDtI8aUQ6UUerLYXnhM5Emacs4Zk hwydzJ58NX/Y/ryvNSEu/Gx8m/tTeWM+IxjWjQfwBTAQVxj248qMlwCLZ8qHu1AXwf+D lbEO1oiWO9sIMCbzYvgto+2egNh6HPakxhRDxsjkqRaOPUHrRNQYxxXGvi4gPJo37rPz svUuKbJZd1eZf+oFUgqqvJkYI76IfnKysZdBlIjQ3+T3V4GB+a/qRx5bnMrOxGujmD1r ChTA== X-Gm-Message-State: AC+VfDw/+G8KyOv85pFajMMHXTFF52S/LvPNL5nOnX4PkqYb2cEu2Eee FbbhRunCLQHv/lA/DJetrIPm+D4cm48= X-Google-Smtp-Source: ACHHUZ4hXRn/Bj/Vw3MLSx84POJjQ48jzZWcLHx7njKBswcS+GqVRQFv3mq3GsjoW0p84MjYCY2rxA== X-Received: by 2002:a5d:42cc:0:b0:309:32d1:59d8 with SMTP id t12-20020a5d42cc000000b0030932d159d8mr1481152wrr.64.1686428495010; Sat, 10 Jun 2023 13:21:35 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i7-20020a5d4387000000b003064088a94fsm7911250wrq.16.2023.06.10.13.21.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:34 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:12 +0000 Subject: [PATCH 13/25] completion: complete --ita-invisible-in-index and --ita-visible-in-index Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain The options --ita-invisible-in-index and --ita-visible-in-index are listed in diff-options.txt and so are included in the documentation of commands which include this file (diff, diff-*, log, show, format-patch) but they only make sense for diffs relating to the index. As such, add them to '__git_diff_difftool_options' instead of '__git_diff_common_options' since it makes more sense to add them there. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e74636ebe86..7246ced14ad 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1763,6 +1763,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary # Options for diff/difftool __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex --base --ours --theirs --no-index --relative --merge-base + --ita-invisible-in-index --ita-visible-in-index $__git_diff_common_options" _git_diff () From patchwork Sat Jun 10 20:21:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275051 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 448C5C7EE2E for ; Sat, 10 Jun 2023 20:22:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229710AbjFJUWF (ORCPT ); Sat, 10 Jun 2023 16:22:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232361AbjFJUVm (ORCPT ); Sat, 10 Jun 2023 16:21:42 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 867213A87 for ; Sat, 10 Jun 2023 13:21:37 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-30aebe2602fso1966717f8f.3 for ; Sat, 10 Jun 2023 13:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428495; x=1689020495; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=L+/f/RVZomTkapsMngxop6R26fwIFTVcMJ/LWQ406iE=; b=ov7X11x4opCUa6gXX3qwJgPm0Bztqycmkpp4k3fGvmk6hethyBD5vp/0O5cgVTPtSW ViM4MY3HYYt5ACCKy095X+jYWYdibrvxKTn/GBsalkzR6anNYl2p4U9Du8Y09ulWd99w zDllOxb6g2HSqgHCjd4rHSGke5RCYZrzQUD7rS0g6z+3g7YPu+y2pn7HlcWWPbwSkvWi OoeT4B8itDyRpXeIZg4T187uZmEnht+ZkLkvqD4VRVWSQjcnfbPnDXix7y7gg9uAo/nx hBoBI+aHhOO+VpCD1ygQ5gDXvitPnGa1OU55LCtI4G9dPUMtCnqiUbp7GFJGtOeUKq/6 6bAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428495; x=1689020495; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L+/f/RVZomTkapsMngxop6R26fwIFTVcMJ/LWQ406iE=; b=VmfelViqw4VF5MCwZEEh7tcGSfgd+rI3N7HPVZPxsUoUtQgh1rcA6dbKGzIpTSq7GK ljaOaZJC6/PJbj+jCJ5H7MfJthS1nZzxt3vtTa6UefKpp9OGxVUkLTOQGIfNABMKLwhg 4QQHMJDESDr/eDOBcm+6fZAgxtthe00AfB0ZttjPfA5tQ41R//iRy7T5d9uxmOmJ0ybY bGzj+xmZg/saDGgPQg543UdNkyZPjzltdkTIZ2yIVIrwSORv6DannEklhgi3M9+xD216 LqpImxKAkpyYQWWTeSD57ymXrQXaQSZVOxQjZLOXBfTGRqlcB4uEDcdnf6PxmqYJfP7A JUJw== X-Gm-Message-State: AC+VfDyRZvuRA39FYKIwzNCvPkFgtRnyv7vPp0UMEXM4UeSdSu7WRv+0 yGBoxltGp7RtWrRulgBvOg1FbzmHpYQ= X-Google-Smtp-Source: ACHHUZ4F0pJoegTySViGv9wcnecWIw2UXzxKSp78y+n8Nrkn2kRFrqEbM92fZ6CwUq39cErD7cmfZw== X-Received: by 2002:a5d:538a:0:b0:309:4e06:ff0b with SMTP id d10-20020a5d538a000000b003094e06ff0bmr1331671wrv.27.1686428495710; Sat, 10 Jun 2023 13:21:35 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t18-20020adfeb92000000b003093a412310sm7854211wrn.92.2023.06.10.13.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:35 -0700 (PDT) Message-Id: <560ad1cd0179f8615dadd8b252b5c3f8cef6822e.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:13 +0000 Subject: [PATCH 14/25] completion: complete --line-prefix Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 7246ced14ad..13d6730f33d 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1757,7 +1757,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= - --irreversible-delete + --irreversible-delete --line-prefix " # Options for diff/difftool From patchwork Sat Jun 10 20:21:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275053 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 17165C7EE43 for ; Sat, 10 Jun 2023 20:22:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232272AbjFJUWI (ORCPT ); Sat, 10 Jun 2023 16:22:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232365AbjFJUVn (ORCPT ); Sat, 10 Jun 2023 16:21:43 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24FF53A80 for ; Sat, 10 Jun 2023 13:21:38 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f70fc4682aso21146725e9.1 for ; Sat, 10 Jun 2023 13:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428496; x=1689020496; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Vt8z2AJxzEwQlYNmo0GCQyhARur9AC9HnVyQAJFP+Ho=; b=Bu48TST1oPrjJPdfotXsCRzaMeVi4qVAQNhyjRyOc+RxOjsGD1urSDxHzEy683vd/J nvUVm+9S9HoYoVgngPVxoyBiOPPSZPrJXjjSNH/ihubFaH/vNe6tyXQV2sZzS6sp13HI wJyx0muqFqd0x+J6sDEzK0BYj3vlU/6fd2U7ptFvvo4VKduf2aHV1a4YIvfYWG8ECyil qhDq7uo2YzBPzhL1tNqtYev79s07ayhi/eWHuyC7+2zPSX9p8w3e2IAEBr8FkA9YOd/v VwQlSOby1SIC+tJDEXH7wTn1bbZyfrpFcE0jb/IsrLovSy7d/K/WF2R29wehlTDP0AuP ONgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428496; x=1689020496; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vt8z2AJxzEwQlYNmo0GCQyhARur9AC9HnVyQAJFP+Ho=; b=cMjC1QANTD7n0rAcM9GeR0O7qCcegkMI36+q6zJYFDyclz8zpJ+8gPZzxsAvYMyP2J oGrz4i4iquFsA6O9qHaR7pkLu6LD4HLRooV/fwPQ4nYF/2izSa7qhWzo9BNlWLg9tFAw EnRfzX3F0BNom0pj12SZ5jq7pb9MzcMci/7Fv/SaZTkltqIoe6fQz1NSkUrX7uCA51kN VBlHkgVZ2bA7rgyBBwVsoPsfQBQ8RSb6hOAVztXcQMeHPFXO2xWiu23lrl3Z+WbJtduf 4HgrWJjZ2XWaDyo/H7gsghf+SD1Ah/79TOr/JaQg704LuMkNA5wQ+roDTLRFh3UZY2Sn LY4g== X-Gm-Message-State: AC+VfDxxEqOASsm314XXBkOTbVTlA3WQx2gqN3U26dP1dqHPOGqf0lwk o1CiradDM6+zpXn2KvZ6yzIpJTydNdQ= X-Google-Smtp-Source: ACHHUZ4R8H5BBoGG6Owm0y3Qp6dspG/VqFjIgGUJxh7jfxXMYCriFYjdl8DUkXi0WWJBd0lsTR3n0A== X-Received: by 2002:a05:600c:2189:b0:3f7:81e9:2f02 with SMTP id e9-20020a05600c218900b003f781e92f02mr3180963wme.4.1686428496432; Sat, 10 Jun 2023 13:21:36 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y23-20020a1c4b17000000b003f736735424sm6491515wma.43.2023.06.10.13.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:36 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:14 +0000 Subject: [PATCH 15/25] completion: complete --no-relative Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Add --no-relative to __git_diff_common_options in the completion script, and move --relative from __git_diff_difftool_options to __git_diff_common_options since it applies to more than just diff and difftool. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 13d6730f33d..f4e773cb997 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1741,6 +1741,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= --find-copies --find-object --find-renames + --no-relative --relative --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code @@ -1762,7 +1763,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary # Options for diff/difftool __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex - --base --ours --theirs --no-index --relative --merge-base + --base --ours --theirs --no-index --merge-base --ita-invisible-in-index --ita-visible-in-index $__git_diff_common_options" From patchwork Sat Jun 10 20:21:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275052 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 E3F17C7EE29 for ; Sat, 10 Jun 2023 20:22:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232682AbjFJUWG (ORCPT ); Sat, 10 Jun 2023 16:22:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232369AbjFJUVn (ORCPT ); Sat, 10 Jun 2023 16:21:43 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D17D43A97 for ; Sat, 10 Jun 2023 13:21:38 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f732d37d7cso29588245e9.2 for ; Sat, 10 Jun 2023 13:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428497; x=1689020497; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=9C4+Z+JYxHOHgPNO9HRTisJPCa1ZLhtMUtS+8PzVvZc=; b=pkpLYDBstnDG5JOp7Mf8lSY16VZQ5Zj/UkxOeocKc4Vk1kyEcXkRP8eHDef6T4ORHV VWbdPLAs3qtLeIr3ROtOiWK3QWawtOKOZx4rMk1Bu30CqrFrpUJ/gnn+P8d4mH+ILXib ZxWbbjt5gul8FVXr9d29yEtusSwXuYyBWSHkyMudoLZvOTXHpMDlzyUA58rRcxM0dW9x W8MndqMAEYaEOQcKBkSBVIblMcTqQExtJDJ3h51rtCq1xDmbDD+m4o1Ljspcq8V6tkW5 k9E4ABx2MVeI/gZ8fQBVcVslt5aSf328fhhhpZqfBEqjhQI2kasCZUFZlgZngaHQ/2pR lXCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428497; x=1689020497; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9C4+Z+JYxHOHgPNO9HRTisJPCa1ZLhtMUtS+8PzVvZc=; b=gcwfDCkaCEf1sLvEvGU1ly4NYlA6gjlvfYrxjq9VOSc8IM8kmotVSsQGOC//7DUu8/ 4htAx7Asi7irfjXwr5gupcqtlt0eAwLEufnEWQRr7iNCO522JtAhnMuKpQYKxz3PPjxX u2IQzrbS+MPK5Xpk8n9CpwX9URJeELri/a0AFlOrUVk10uwnlu3CQAFlIctqJwVWnhYT 3yLlQ9JhjKKa03FR0iueQU0NdnUqVNc0RB04JltqgSI1mdIUR2nhQsbj35D/sW8DqQ/h 9tZJKQHwM3WeI7Q/jZTOEpp7I4ccRQ4frlOfa7lVgByUqq1XMW+jo2CPbEkFIx4erY9v KfIg== X-Gm-Message-State: AC+VfDxezeIjIlqET+1fM4RMq6MIf17BS3xHV8RJGT1LgSLCUDyR7IsL ugweNqXZ18+Vvg0VU++9RL2+FZrzm5c= X-Google-Smtp-Source: ACHHUZ6jTH6xf1egpQkngbUKD274ucF9ePQKeX8ufu3SjpZOhN8Yo0Y+yl+5dPUVssn6s9li6F6/iQ== X-Received: by 2002:a5d:5450:0:b0:30f:bbec:216b with SMTP id w16-20020a5d5450000000b0030fbbec216bmr103379wrv.65.1686428497127; Sat, 10 Jun 2023 13:21:37 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i7-20020a5d4387000000b003064088a94fsm7911298wrq.16.2023.06.10.13.21.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:36 -0700 (PDT) Message-Id: <0f16a466fd9bdafe0365ee9cf1bce81fc11767d1.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:15 +0000 Subject: [PATCH 16/25] completion: complete --no-stat Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f4e773cb997..ec2e4c9e711 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1758,7 +1758,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --textconv --no-textconv --break-rewrites --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= - --irreversible-delete --line-prefix + --irreversible-delete --line-prefix --no-stat " # Options for diff/difftool From patchwork Sat Jun 10 20:21:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275054 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 2599DC7EE2E for ; Sat, 10 Jun 2023 20:22:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232475AbjFJUWL (ORCPT ); Sat, 10 Jun 2023 16:22:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232405AbjFJUVo (ORCPT ); Sat, 10 Jun 2023 16:21:44 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA72E3A9E for ; Sat, 10 Jun 2023 13:21:39 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f6e1394060so21173245e9.3 for ; Sat, 10 Jun 2023 13:21:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428498; x=1689020498; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=sE7FKCR7Q34boOA4FM3Fk6A0qBBnNg8uNK4v55FkdHs=; b=OQbBRigwULovguDHbA5kgvGFK4vDvaUJFm3IGk/0eQjV8C8hHuvS25GedQEcQvMXU7 sozkchqVqnqEFpIOHxQZgxEud5YOkbr5jxFbLYL15guIF/OhBU1iJFo7ykBNdUwvnUJn vXxUHi2fkt0x9wKMeqUkxXToEiF0GqYWVJmw2lEEpxHD9sQkRfYg6HKQcTH4ucL52B6a cY3ud4w+YORwlv5TF7IMzTlrzM8aCMozI79VdgwgJT7HdcdkDn3W1ZkxteimKq1HIH46 LwyJ0WZdK7hkWn8oBaNcd92yziwDdRhnxKtvS2d+f+BUya+hFM/mfygXwMpO/haJUOVO d72g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428498; x=1689020498; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sE7FKCR7Q34boOA4FM3Fk6A0qBBnNg8uNK4v55FkdHs=; b=FtFG50nQujRVXNjddyU2NrT1AMOjUQeAQ1O0bC3X8XjCfvUGlZFrwRFHl54tXmhY7V gAS8R7WbXfkP+70MxVPfwGT8FEDd6fgOYjYzIjjcDWzTpXXRt9Iy9Ip8W8eyhnBo3Sc0 qL4jwcv0+RxE1hwLyJcfYsgeBRPk1l+3VjyMDvWxjYj+YkJEApcnE5ctOpHxF1k6do3r nIjCLSuQyqe3qi/6d5L1/lC2rRM8tDa0BKRt78E7c6/Uv7+ocT74RM9Cb8DySWVsR9M4 nQBjtvfYuTzTnj2ZxYi5QC4iO52XqAqZnp8KNYMxFXkBiXF8KPu3BHREYJyoFvD4YNV9 Ze3g== X-Gm-Message-State: AC+VfDx5nHbCacqD0EMRhnV27odQOgPsRulq48yRs1+BqJcNIZm5MxYM joGJZZsaxB/iBAY+cJZgcqSZ1PX2Dsw= X-Google-Smtp-Source: ACHHUZ5KWXoqasNLLGKTyGe54XdJsT9yIqJmBfK/3Ad1uad61grVmGfN4k8DB3kR41kiEBLPhqn7QA== X-Received: by 2002:a1c:4c15:0:b0:3f1:70a2:ceb5 with SMTP id z21-20020a1c4c15000000b003f170a2ceb5mr2990301wmf.13.1686428497853; Sat, 10 Jun 2023 13:21:37 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i12-20020a05600c290c00b003f7e653c3e3sm6564396wmd.21.2023.06.10.13.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:37 -0700 (PDT) Message-Id: <761c75d4aec988609a105db0f039ad9f15d2337e.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:16 +0000 Subject: [PATCH 17/25] completion: complete --output Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ec2e4c9e711..a34432796bf 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1759,6 +1759,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= --irreversible-delete --line-prefix --no-stat + --output= " # Options for diff/difftool From patchwork Sat Jun 10 20:21:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275056 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 2B25FC7EE29 for ; Sat, 10 Jun 2023 20:22:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229885AbjFJUWP (ORCPT ); Sat, 10 Jun 2023 16:22:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232473AbjFJUVq (ORCPT ); Sat, 10 Jun 2023 16:21:46 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D4FB3AA7 for ; Sat, 10 Jun 2023 13:21:40 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-30c4c1fd511so2677421f8f.1 for ; Sat, 10 Jun 2023 13:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428498; x=1689020498; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=icmOegVGKbOh0P8m6bXToPWg2ZvsGRKdZQqlcgh5YwI=; b=sIwrXrlWvp3l7eVg6KlkvzkpBVZ0PMIrzKB9pMdk4r82TL1SsUCoc+NHYModRmrcKO J+2heRAi+CzKI4n7Roj+adlhBrPNdzxyni5lw1/GBdKYYzMFAD2uLCPN7jH+OSBI7Pir WthbqqGlH98fwVTm+ESDI5E+YO86a5aBBp3BMuy9hTYZytpf7X3CUGoPKKVlihDJ+foY wlxFL2CZIDISZdUqaw+5d+IVlQScDOzZR0tb2/gmw4VwD6k0M+jJkXLwZ53z8d9216nE Gqpo259cKs529zkaHLinpT9coaHjKqe/XuSWBqe8scF8zpu92D9No9xrpPBz4JLncnT9 enOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428498; x=1689020498; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=icmOegVGKbOh0P8m6bXToPWg2ZvsGRKdZQqlcgh5YwI=; b=J85AomPUaidXCk4WGxTfJDEL4GPpB4EQkqvp7eNhfeEMsx1qslAM7nCCHQ35L6iYFX Kf2dc6GEKpAIYqDyfr4r3ZhLJb42m5bp+qJCkDtt8zatnTDJxj90Zu5Gxx9os2qwP78L WRqS6Mpa0gD9P4qPpkqOrRmKF5Z4igu49hB4gslgkle4BuBpDShTWlaRcPcooW6s0MdN zJq3eeIzMLKq1DF9a3DXL+JW+aLQWMAk9vgNyFZmo7okq7erRErqvA4WPjyv6DSod399 HSZU8FZCkTMkaymfuQpp0W4G5CfoCVKVh02ndoqiAkTd2y+v94csQpqQKQjiI+Bj3cw7 X/7A== X-Gm-Message-State: AC+VfDyqFCjmAxc6kRd9mqwBqSByAEkF+htjgr8O6YBHz80lWBPMnMGj pOm6944BadCsGp6Clxv3F6GzpF31kFY= X-Google-Smtp-Source: ACHHUZ4YnR/yOT47k35yE12BN6rbzVEj4RkqF4Nsx7/++dA4zoyEpMU+dtUKKDLW8w1NZscrRH76jQ== X-Received: by 2002:a5d:53cc:0:b0:30f:b341:79ef with SMTP id a12-20020a5d53cc000000b0030fb34179efmr1386450wrw.71.1686428498535; Sat, 10 Jun 2023 13:21:38 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g9-20020a7bc4c9000000b003f7f249e7dfsm6677814wmk.4.2023.06.10.13.21.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:38 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:17 +0000 Subject: [PATCH 18/25] completion: complete --output-indicator-{context,new,old} Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a34432796bf..a69421cd740 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1759,7 +1759,8 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --patch --no-patch --cc --combined-all-paths --anchored= --compact-summary --ignore-matching-lines= --irreversible-delete --line-prefix --no-stat - --output= + --output= --output-indicator-context= + --output-indicator-new= --output-indicator-old= " # Options for diff/difftool From patchwork Sat Jun 10 20:21:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275055 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 09230C7EE43 for ; Sat, 10 Jun 2023 20:22:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232742AbjFJUWM (ORCPT ); Sat, 10 Jun 2023 16:22:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232465AbjFJUVq (ORCPT ); Sat, 10 Jun 2023 16:21:46 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65E013AA4 for ; Sat, 10 Jun 2023 13:21:41 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f7ebb2b82cso30784535e9.2 for ; Sat, 10 Jun 2023 13:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428499; x=1689020499; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=yRxjfJg1uXE6Fstm9uVOLObk2IL6n83aPh98fojxElM=; b=KllUfUiM0rsZ4vvMdBvMUgrerHhG+Fhsyca4mF/P8kYjXGb1roC4DgWqsShyhtBg1K GbkAxa+9cz/j9zaEkLwZm8lf/R4YEpUmnkdxx1CI+iRwUJZWBt0yvWLWb0uCUYyCZwMN gzfOrPBtqsEGkNaMnzYyXT3LghMLELmZ6DY6+M3R409sH2rbM/6Y1Hy2DeUx8p/9NeR0 uxlUkhqYIzvXA5YdLqS6aLur++X/KdBuRkZX270cWvZZjzNHfHWiWfVtLOsrROLkaAU3 lS65tqOtz3eRbfuHnMfVBDjBusvsdR+SDkzCCLvAoiJ1UA9eZ3ny6h6Pb7uBzokVPkmu /uWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428499; x=1689020499; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yRxjfJg1uXE6Fstm9uVOLObk2IL6n83aPh98fojxElM=; b=dpxOS305thjwkOJlMAPnsbfKyllyT4UFV7q9Wx7pddpNBj40eDYKQDBfTylytbt7ZH CyfBy7eXHOiG/iz/JSQZ5ZNXzFbYaqk4Dx/iS/R2Q1iOmq+EqN1oIbBr12wrvZCHSUE2 IfKC3V47i6eZVU3O/VmpYCAn/U125uuI06CRoGW8JmYebvvC7ugLaklHlY+2R6C8v4VR kZbEdLr9FWZ1U2S1oYbRhxueQXqvZaM7oXFzVqv5NA0M9nspsX47Ra+9ZHH08Gb610LV g8KrRv/UzKKBaXQ63c8CDNAO4sFHypgKv9BLbzebQANMG+iIOJd1AIrQrh/x6Jtm9A2u 3egw== X-Gm-Message-State: AC+VfDxpKYnslQKMCyYDTmQnnnHlykWdxCAtSIphYMpOPMgnclpGixuI HK5V5Tugq31ooOEQ0h8g2pGNN5lwx1A= X-Google-Smtp-Source: ACHHUZ5QyWopQ4U5pbiZQ6vG663yx5x2QLJKIqKsZO/Ja6HBn+6JL1AlIX1EjVyELMJ8/MnafBUq/A== X-Received: by 2002:a7b:c4cd:0:b0:3f7:f8d1:122 with SMTP id g13-20020a7bc4cd000000b003f7f8d10122mr3972543wmk.20.1686428499340; Sat, 10 Jun 2023 13:21:39 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p11-20020a1c740b000000b003f733c1129fsm6548346wmc.33.2023.06.10.13.21.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:39 -0700 (PDT) Message-Id: <807b8201d145a21c629797067cee21d1d1b9a0d4.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:18 +0000 Subject: [PATCH 19/25] completion: complete --patch-with-raw Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a69421cd740..c0d2678d320 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1741,7 +1741,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= --find-copies --find-object --find-renames - --no-relative --relative + --no-relative --relative --patch-with-raw --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code From patchwork Sat Jun 10 20:21:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275057 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 23EAAC7EE2E for ; Sat, 10 Jun 2023 20:22:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232473AbjFJUWR (ORCPT ); Sat, 10 Jun 2023 16:22:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232499AbjFJUVq (ORCPT ); Sat, 10 Jun 2023 16:21:46 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E58A93A8D for ; Sat, 10 Jun 2023 13:21:41 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f7f543fe2fso29387565e9.2 for ; Sat, 10 Jun 2023 13:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428500; x=1689020500; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=TDvxqnfpWYnoIzV5Z9Y90KCQwDVlVuLP1sO5xxzYWXU=; b=WMY6ho7sNkJgZO/L83pWm6K+uNOWuHjAgkHmlvnmJR1gmSng1Od7bIuy+4ljtVsqbD mW+Nsq68kRs7oiYpXp1wdMn9GM19LDVkoV6z5lyMBhSHsur4TRJRCnzbyczlAVfbf7kT 4skT5VX7Xhs6D12lwJU8w2CZDRREZfIqV0zoD+DZYK/qQjkh+ZdoBCRiNZiZsj+a4EN1 QKHCMSoY8Zbp6pwGzG+PefeSHYtmprYb9ApIJIHFz+c6G/Whgq+3zeRmiszjjksgG5n1 W+S/reRNL3IZbgw3RYAkESWvAHAtdMV7OYU4P6qZB1Gl9FYOqOj+9n9lcq3ueJOU9d0Q 3QSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428500; x=1689020500; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TDvxqnfpWYnoIzV5Z9Y90KCQwDVlVuLP1sO5xxzYWXU=; b=CgMeu3y5SWPXueEDPPCpw8U5Cpv2WrmSSfkx2L69GSmDPU/sEbw3vHfcfe7xqb9dT0 9fE3v6BoV0tQW7SlxkPu6LX/hTu38t3BhQhcNJ2KcZm1KGYnAjo8LHsOx1sKXmeXObrg 11SgCFaYZfAvfc50IM7QwlroLgKf0o9mheqdYuipLPGSZ9Tnw3bc+rrnvIkZPG+GQpnf KZkjJTLFN2dzYF+8U5qxnrtbLmySCQgf701y/lrVFULcR3YjxC9ANMQwWYioVV592MxY k4YqtPSIA46Z7KszzRT6gZo7V33BdurBQWjQAnQNbLQHORuKsx5sb5yL62+wx3d6W7Zx sqdg== X-Gm-Message-State: AC+VfDw6I+uTeVAW/U02V4WZc0/cy0E8domEsez+wdjHaSNwzkN8aw5K q2hy4q1RwU9jzFU5CLNPNsvVpkPoWdM= X-Google-Smtp-Source: ACHHUZ6tOjq2Hk0QNqKhSsZJ6T+55spl4IEXpEnbXpWMlUHIOSbDNRYD9Ws8Hx/ZUsYNQUtGyT37KA== X-Received: by 2002:a7b:c84c:0:b0:3f6:76e:604b with SMTP id c12-20020a7bc84c000000b003f6076e604bmr4063879wml.0.1686428500111; Sat, 10 Jun 2023 13:21:40 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l7-20020a7bc447000000b003f7f36896f9sm6487017wmi.42.2023.06.10.13.21.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:39 -0700 (PDT) Message-Id: <19507b1a2109f419ba5c628c32db46f96903e166.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:19 +0000 Subject: [PATCH 20/25] completion: complete --unified Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index c0d2678d320..230d5807860 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1745,7 +1745,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code - --quiet --ext-diff --no-ext-diff + --quiet --ext-diff --no-ext-diff --unified= --no-prefix --src-prefix= --dst-prefix= --inter-hunk-context= --function-context --patience --histogram --minimal From patchwork Sat Jun 10 20:21:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275058 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 690BDC7EE29 for ; Sat, 10 Jun 2023 20:22:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232779AbjFJUWS (ORCPT ); Sat, 10 Jun 2023 16:22:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232501AbjFJUVr (ORCPT ); Sat, 10 Jun 2023 16:21:47 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94A0F3AA8 for ; Sat, 10 Jun 2023 13:21:42 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-30af86a966eso1965212f8f.2 for ; Sat, 10 Jun 2023 13:21:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428501; x=1689020501; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=no+EASTPSN3Pq0YxPdiIJzmY/HwfxJjHV5gqh+mmDmY=; b=PXwa+nsre9mPmSCCzSnxj1dKf8OMAIyvXVBaS0UaB0AZroW9WDXn1nlEHSWjmeMFEQ pdn+kXpR1vqeGXCHwOW9PnJLQPY5rUiqo8c026QCpCnQhr7uz1zep4q8t5fOm2OWI4KL uJ/NrfhHt0LpRpFsvG8xQbA6jGO3mkPSKluFKaggLGDsc5jYxIAJkoMJCf/tm9k08CaV En20dI+Nbb+Z3bVTF2QURSbVfZkvG4nz2Bolj3/OnxyILBkQVDsxdM1cA1K3wMnsStLG 8uHoBXZPfuLuxcCWwO9hts17a3GnaTS7FriQbOIVSSblIoqN7N5ful6LKtlbtmM/4YJO 65Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428501; x=1689020501; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=no+EASTPSN3Pq0YxPdiIJzmY/HwfxJjHV5gqh+mmDmY=; b=IQWB82daswVQraf56vf8faAADw5Fu19E9LGZfhiNsavveZRSG9rZ4OTX3CiB+IsFHW BcM8Xu0eexjN01AlLGrWzQLyH6AHFmBLuIg5DxkId8liEHczGNVIRUsDvumQ7iox1XlC gIlA6wa4RvULh7VfIsCZf1PIf8/Y6PK0st1aeF2dhKGQl7uKl4RZ2na/tGVK/pAThN2Q E306ykdENy0vUu4RQmZTIGzi1ZL7RDK2vSXBo5+UDOJEXsZD7yVltK8jrr+u7QBD/YL3 9Rq7wVv8UqOAilyM70hlTzhLUNNU3LD5w1u09+A6GTh1oDo09gVpoT+q1dp2jSJm6SIB QyiA== X-Gm-Message-State: AC+VfDwwEYSNcSQvObwqSQPHwW9iQQ6CueMoZE2uBMbSOtGDrEoaHWI+ k4Oe1KdEmmdxSyX90/ongrZ/IlJPBkA= X-Google-Smtp-Source: ACHHUZ5a5gV0fK4mtsmn140igmOM3hQngCQIVT8o+sP0iKBCHdGIv0aPoaMp04Q1NjZOj/S6wAMlkg== X-Received: by 2002:adf:f549:0:b0:30d:981d:a03f with SMTP id j9-20020adff549000000b0030d981da03fmr1201975wrp.6.1686428500806; Sat, 10 Jun 2023 13:21:40 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q11-20020a056000136b00b002f9e04459desm7793212wrz.109.2023.06.10.13.21.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:40 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:20 +0000 Subject: [PATCH 21/25] completion: complete --ws-error-highlight Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Add --ws-error-highlight= to the list in __git_diff_common_options, and add the accepted values in a new list __git_ws_error_highlight_opts. Use __git_ws_error_highlight_opts in _git_diff, _git_log and _git_show to offer the accepted values. As noted in fd0bc17557 (completion: add diff --color-moved[-ws], 2020-02-21), there is no easy way to offer completion for several comma-separated values, so this is limited to completing a single value. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 230d5807860..93522558a98 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1733,6 +1733,8 @@ __git_color_moved_opts="no default plain blocks zebra dimmed-zebra" __git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change ignore-all-space allow-indentation-change" +__git_ws_error_highlight_opts="context old new all default" + # Options for the diff machinery (diff, log, show, stash, range-diff, ...) __git_diff_common_options="--stat --numstat --shortstat --summary --patch-with-stat --name-only --name-status --color @@ -1790,6 +1792,10 @@ _git_diff () __gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}" return ;; + --ws-error-highlight=*) + __gitcomp "$__git_ws_error_highlight_opts" "" "${cur##--ws-error-highlight=}" + return + ;; --*) __gitcomp "$__git_diff_difftool_options" return @@ -2080,6 +2086,10 @@ _git_log () __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}" return ;; + --ws-error-highlight=*) + __gitcomp "$__git_ws_error_highlight_opts" "" "${cur##--ws-error-highlight=}" + return + ;; --no-walk=*) __gitcomp "sorted unsorted" "" "${cur##--no-walk=}" return @@ -3000,6 +3010,10 @@ _git_show () __gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}" return ;; + --ws-error-highlight=*) + __gitcomp "$__git_ws_error_highlight_opts" "" "${cur##--ws-error-highlight=}" + return + ;; --*) __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit --oneline --show-signature From patchwork Sat Jun 10 20:21:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275059 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 D3B28C7EE2E for ; Sat, 10 Jun 2023 20:22:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229522AbjFJUWX (ORCPT ); Sat, 10 Jun 2023 16:22:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229542AbjFJUVv (ORCPT ); Sat, 10 Jun 2023 16:21:51 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D1D63AAC for ; Sat, 10 Jun 2023 13:21:43 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-30ad8f33f1aso1900860f8f.0 for ; Sat, 10 Jun 2023 13:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428501; x=1689020501; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=f5BkXreb400WVeOfBVlIPrRt2tE9+3uwExECt0YY96k=; b=puxbgW25RgRJ/8gZgpW5kLfhqzvjzhHOFXpgB4iXVXFRhHUvDJWmgpvxQ+w8tfEaoW V6rHXImX/z/KMFf94hCFG6Hmv1x9BxAc3KqbxtU/MjNLrzUBE2aIRJpc/afKvKgE3pii DIzwJ2dUG1HmTOYjMhG0u6dPqSXhFud7CFyWwa03izH7DgDC+MnMvz9tNYrdU802Kjdl bBERAmRvhcOcYbzr8DnGc9RABqJuWiMxYfW2YMwVJUezaDKKL2fSZYIvl20V3cLdxx3j piLZRLu+JR7BMrFhB79h/L1GmdVoh+0UAdkRqyIM+kFPg1NDOpo1ciqu5Rx/ouniOhoP Wl4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428501; x=1689020501; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f5BkXreb400WVeOfBVlIPrRt2tE9+3uwExECt0YY96k=; b=NT7FLywPKJ9lgCqwSKNlb0ARAUWxrtarGZwgQam9I/+uSk1RKOUNviOJ+CRjFWgyqQ 6sJiKq1Ij9uK7Ye4kptPqAgQAVbKoiDPGJPSfy4/Q8xCIuww/NKSwX0wNkZhZHlrvnBW iOs6dcPlQ14Qx4zCYmbHmJzTCW8P/e5b+sS9tJqfV/V+VnIoG22xa0aPXAJRIYm15S0e QpGGYopl1efLeHVy7R9S49bM04rPDVRXuLpv+fybpswQ5UOU5sI0/1PS9n2NSYhq78Uz 4Eb+v5MgbEl2cM8AqbAAd7qOiA4GX4Eg8Uj5f9tSw3rAvfegkoyAboj6pl0KMu+e+wrA C4xQ== X-Gm-Message-State: AC+VfDzbdWXkbEKGiyT5/LHiZflEudfheuKv1SajfxbK/eS61StDL1is tvF+pWyiljFVFNapWED7Z504dZFZr9E= X-Google-Smtp-Source: ACHHUZ6wfLdbyG+wZb8O66BdnIeRMOpuKNmoV2oYLsz7ODIvfy8e0u7YvznCbcete9O+1GAz6n6WqQ== X-Received: by 2002:adf:ea05:0:b0:306:2a42:d23b with SMTP id q5-20020adfea05000000b003062a42d23bmr1176817wrm.6.1686428501432; Sat, 10 Jun 2023 13:21:41 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q12-20020a05600000cc00b002ff2c39d072sm7857838wrx.104.2023.06.10.13.21.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:41 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:21 +0000 Subject: [PATCH 22/25] completion: move --pickaxe-{all,regex} to __git_diff_common_options Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain The options --pickaxe-all and --pickaxe-regex are listed in __git_diff_difftool_options and repeated in _git_log. Move them to __git_diff_common_options instead, which makes them available automatically in the completion of other commands referencing this variable. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 93522558a98..8dd54fd3ae0 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1763,10 +1763,12 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --irreversible-delete --line-prefix --no-stat --output= --output-indicator-context= --output-indicator-new= --output-indicator-old= + --ws-error-highlight= + --pickaxe-all --pickaxe-regex " # Options for diff/difftool -__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex +__git_diff_difftool_options="--cached --staged --base --ours --theirs --no-index --merge-base --ita-invisible-in-index --ita-visible-in-index $__git_diff_common_options" @@ -2115,7 +2117,6 @@ _git_log () --expand-tabs --expand-tabs= --no-expand-tabs $merge $__git_diff_common_options - --pickaxe-all --pickaxe-regex " return ;; From patchwork Sat Jun 10 20:21:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275061 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 2BADEC7EE29 for ; Sat, 10 Jun 2023 20:22:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233073AbjFJUW1 (ORCPT ); Sat, 10 Jun 2023 16:22:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230296AbjFJUVy (ORCPT ); Sat, 10 Jun 2023 16:21:54 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCACD3AB9 for ; Sat, 10 Jun 2023 13:21:43 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-30af56f5f52so1940683f8f.1 for ; Sat, 10 Jun 2023 13:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428502; x=1689020502; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=zpNh/zH78AgbjFvEF91/NI+i0cWull5Zhd51l90hePk=; b=oTUssyMfzD+ks0zZswJoWg1lZhO2PtXKSlrs8hOlwkiGoWhteIs1zq4WMQxaO1uQoB 2ETZ6L+8j3cd+uoE6WqmxdhAx0nUEETcH/qM26s72L4EuSp14jQLDZLd1rlpTjacL8Ln zAq480GQM/jfQYJiFrFuhSwomfrrGiVDBZjgDrjTX9JZDq5r55kc2ANBc8fxcfctYdKI i5vQq6O3uxb+KuWd+QxqVaeoIH84owzHyxgEXYnntOKvcdKlE9AR7C313LHw7NEH+uO3 qZJNgi/++hVJHg72zcJ+4epVOCnZ4av+R1+V4so3ewt0S8Zr8l714k8KEfc+SsWcuHuI QzOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428502; x=1689020502; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zpNh/zH78AgbjFvEF91/NI+i0cWull5Zhd51l90hePk=; b=WSInfJ3/PTUIscbjHNLo0gilhDDu8syThxlc2yBzdC9/yGj6jlqws3E8wWsmJQBL1+ JhqFLNEWg1lG+hMB6E8cuAZsK04OVFLLihunsnLLees+OkWWQI3Kh795v68G5fh9u7CR TSHg/NzLaZzi8cjWxqztMv7504LaTt2IDIx5v9CyCajf10jVIZOUX237BXBNIQg+ztpz MO0xeuTxuKS7F/NBgstkgaXxfAM7sfpsMnRNhPILEDmqjkPjkdZDV8G2NKrreLWsmRSg fzHK2itPiAs+Ju2Dql55ZNlNAvRKDteoGmA6MB8vksT3I2QIn5OmhUaA3iN3xyw7cKbx CFeA== X-Gm-Message-State: AC+VfDypRT/6PETdpGeIliF05GWn9hp4jqPIYw1Jh4Dd21YAEPnkuJIY ZAOJB0pRUTHhshzI/gq+Efj+eXMLANE= X-Google-Smtp-Source: ACHHUZ76Y2HpqaKBZfLPxCgKXXZrNuBBf43sy/zE7CsAX7AtAPmX6C4Ct2VXq/RXSVvV1N4497qJIQ== X-Received: by 2002:a5d:42cc:0:b0:309:32d1:59d8 with SMTP id t12-20020a5d42cc000000b0030932d159d8mr1481291wrr.64.1686428502075; Sat, 10 Jun 2023 13:21:42 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i1-20020adffc01000000b0030aee3da084sm7869719wrr.49.2023.06.10.13.21.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:41 -0700 (PDT) Message-Id: <5dc1e541d1606807e188015ce51da4f2c7f8ff5b.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:22 +0000 Subject: [PATCH 23/25] completion: complete --diff-merges, its options and --no-diff-merges Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain The flgs --[no-]diff-merges only make sense for 'git log' and 'git show', so add a new variable __git_log_show_options for options only relevant to these two commands, and add them there. Also add __git_diff_merges_opts and list the accepted values for --diff-merges, and use it in _git_log and _git_show. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 8dd54fd3ae0..7b7f3f838e0 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2040,6 +2040,12 @@ __git_log_shortlog_options=" --author= --committer= --grep= --all-match --invert-grep " +# Options accepted by log and show +__git_log_show_options=" + --diff-merges --diff-merges= --no-diff-merges +" + +__git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r" __git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd" __git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:" @@ -2096,11 +2102,16 @@ _git_log () __gitcomp "sorted unsorted" "" "${cur##--no-walk=}" return ;; + --diff-merges=*) + __gitcomp "$__git_diff_merges_opts" "" "${cur##--diff-merges=}" + return + ;; --*) __gitcomp " $__git_log_common_options $__git_log_shortlog_options $__git_log_gitk_options + $__git_log_show_options --root --topo-order --date-order --reverse --follow --full-diff --abbrev-commit --no-abbrev-commit --abbrev= @@ -3015,10 +3026,15 @@ _git_show () __gitcomp "$__git_ws_error_highlight_opts" "" "${cur##--ws-error-highlight=}" return ;; + --diff-merges=*) + __gitcomp "$__git_diff_merges_opts" "" "${cur##--diff-merges=}" + return + ;; --*) __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit --oneline --show-signature --expand-tabs --expand-tabs= --no-expand-tabs + $__git_log_show_options $__git_diff_common_options " return From patchwork Sat Jun 10 20:21:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275060 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 CB00AC7EE43 for ; Sat, 10 Jun 2023 20:22:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232574AbjFJUWY (ORCPT ); Sat, 10 Jun 2023 16:22:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229869AbjFJUVv (ORCPT ); Sat, 10 Jun 2023 16:21:51 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7514A3AB3 for ; Sat, 10 Jun 2023 13:21:43 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f7f4819256so22113915e9.1 for ; Sat, 10 Jun 2023 13:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428503; x=1689020503; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=bBjVsTfHC97mrXrTf7OOMY/gBC1f5uYUeDEimD9hNGU=; b=SRh+X1+6AgG6aDvDlTjDhkiiGR9OxxL3UNQqKzaqlLaUu7aw0DwGOutWQVlXM9CY1/ xC+i+v9JE5yxyhUqoWctWtC0GjnJmngjFD54ZyIuvl7Mjg1v1xj05ZnhGo7qCbYU+fPn o3o0oDg7f9b9x6qN9wSQ4sw3Buz54vltXRYp93XhAiaJNeOfwFlSBBBrnKMwBQt60dlq FydmpOIk4MI3zCOt63cAQLHO1RCcnif6bRnWcdFVuPvg8tsQBy3i6q8A0Qfjb1kzjlv8 2tthoQ3seK2Y3vhUF88PEv/Bv31Y2s9BBvyXPJU384QSOVKxuLmqG8YoRyJ511pELuOZ Ac2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428503; x=1689020503; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bBjVsTfHC97mrXrTf7OOMY/gBC1f5uYUeDEimD9hNGU=; b=RTOn5PN0Fvje8A455ReY8+Q/T4q98gcp8aFE2qFJgrBqtBUIG9SX/ky3ewq2s6ruV2 R6fZabTE/T1luWiVHimdocIJkeYyf3pCpO8knqQXebBDJi/nrdTgKVJtPid8P3m7hTJ4 r5khNPlUs/B4eSDfUGy2x+ftzNOryIkGm+Y/S0Erf/YuWDj5sB1BV8eHCtI7LMHZOFuc 1Q77LGA/PeJ4VBQWqkmMDfYGyEsPYo97DLIxwQn2S16SKdsNqMN75BbUK6ZpN+9N/aMB 0XSZLnRud6kjM2v3E1f7+v8xxcfuJpG9qxzYn7obgQmA1YeDg/8TwcOCgKuasgMTf9bu 7JPg== X-Gm-Message-State: AC+VfDyuBQRnopNc4b8WujmXJOCQ4bIbXjb7eHtDSm2D2APYi2Fjsuif DeBa6pFfSVk1vCPYBEOeKOyzkEXFmk4= X-Google-Smtp-Source: ACHHUZ5h5xu22FN/ORC/C3nS7Hhxy1PRsa67E3Raob9jDC+8wh3+13rG/raQNcdSCXIi+jpg0488QA== X-Received: by 2002:a05:600c:290:b0:3f7:3991:e128 with SMTP id 16-20020a05600c029000b003f73991e128mr3471282wmk.2.1686428502710; Sat, 10 Jun 2023 13:21:42 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n16-20020adfe350000000b0030e5b1fffc3sm7921811wrj.9.2023.06.10.13.21.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:42 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:23 +0000 Subject: [PATCH 24/25] completion: complete --remerge-diff Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain --remerge-diff only makes sense for 'git log' and 'git show', so add it to __git_log_show_options which is referenced in the completion for these two commands. Signed-off-by: Philippe Blain --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 7b7f3f838e0..38b6bac9154 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2042,7 +2042,7 @@ __git_log_shortlog_options=" " # Options accepted by log and show __git_log_show_options=" - --diff-merges --diff-merges= --no-diff-merges + --diff-merges --diff-merges= --no-diff-merges --remerge-diff " __git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r" From patchwork Sat Jun 10 20:21:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Blain X-Patchwork-Id: 13275062 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 919F6C7EE43 for ; Sat, 10 Jun 2023 20:22:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233100AbjFJUWa (ORCPT ); Sat, 10 Jun 2023 16:22:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229894AbjFJUVz (ORCPT ); Sat, 10 Jun 2023 16:21:55 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4123C3ABB for ; Sat, 10 Jun 2023 13:21:45 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3f7f6341b99so22074665e9.2 for ; Sat, 10 Jun 2023 13:21:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686428503; x=1689020503; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=3jMKHyrK/DvKpC9ic6bhimoZDxB2Ab5NFj9E/8tc6ko=; b=JUVzDMnwYZUJ/Cfb4FEFT71Hu7VGD6PHYUmE2EVdLbCX7Y0dV/p5MKoOE+9anZSMM2 ldpSvZrUV3p+BKj6zKvlnwYh4LYpEuvBFYfKt2mhnfXaXpD5+PFBW+/VjtcF3m/nwfEh GUrUGsy5dh/uwcFTMUN3iZpedRbJEBApdhlEKVEG0VQbxYaLxIFxmn+l75xS2XCKpD9E ZtgrZthKlKjVNnJU4b5j5TfERPJb7bEgFO5riXbr8J0vijuZAaVXB07xKit80BJDQOOj AfSov3Li540vgNJ8vhKG2zm+MMhzLlJpgreuE9gddBGaFPNudf5HPTI5347dpHeCORJ0 HhHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686428503; x=1689020503; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3jMKHyrK/DvKpC9ic6bhimoZDxB2Ab5NFj9E/8tc6ko=; b=TfQEgrG0Q3of4V8K5Bh5MdNz/84Z5LzHZ/A7jqzimIObb/Nr1SOc/7Dcj4mRXmKh9U W4J8wFftbydnI2p46iSaZUHDy+pPmsFuiUa1Ybjkb8PVJ0u1SnCLCZyX7JgymFxecjku xNnaOL4ANfS1i+1XorSk7t+xKPSk50c8mpjeICch/0/5jQHjrFe1ljyuJTxEItYOExLx hkd9rwkD2WOgNFAVaOj2IqFTYzWvxv0wpAh68DPc8IbNzzUGDtvl2n8HnIKTpfiMVLoO G985PaP4kVskPd4nWd4v1jIkdEFg3LOIr+UJmcKHetBZjXYm+217eJ6cypmzY1OkgPhr Ii8w== X-Gm-Message-State: AC+VfDyZ4jlqNhF57KL+cLdpbfkcT29adZ6AgGy/rSeN6F/F0XH2exq5 Fb64Rnob6E+Yn258gRENuBpzVlXmV1I= X-Google-Smtp-Source: ACHHUZ70ZG1arz9kd6m7kZ5fgJ2/Ll550mlr6w6H2plWC8Qwq0VFXz/ulczFqK1HbTvQwFLQa1ZdpA== X-Received: by 2002:a05:600c:2044:b0:3f7:e800:abc8 with SMTP id p4-20020a05600c204400b003f7e800abc8mr3567904wmg.15.1686428503495; Sat, 10 Jun 2023 13:21:43 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o40-20020a05600c512800b003f4283f5c1bsm7510232wms.2.2023.06.10.13.21.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jun 2023 13:21:43 -0700 (PDT) Message-Id: <93b6233f0dd89d36c0eec7a4768f8b7d22db755b.1686428485.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 10 Jun 2023 20:21:24 +0000 Subject: [PATCH 25/25] diff.c: mention completion above add_diff_options Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Philippe Blain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Philippe Blain From: Philippe Blain Add a comment on top of add_diff_options, where common diff options are listed, mentioning __git_diff_common_options in the completion script, in the hope that contributors update it when they add new diff flags. Signed-off-by: Philippe Blain --- diff.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/diff.c b/diff.c index 3c88c37908d..fda7bc91f85 100644 --- a/diff.c +++ b/diff.c @@ -5491,6 +5491,9 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns return 0; } +/* Consider adding new flags to __git_diff_common_options + * in contrib/completion/git-completion.bash + */ struct option *add_diff_options(const struct option *opts, struct diff_options *options) {