From patchwork Thu Oct 5 09:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xaB0xJtww6FuIE7Em21lYw==?= X-Patchwork-Id: 13410096 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 B3A14E92701 for ; Thu, 5 Oct 2023 14:09:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231162AbjJEOJF (ORCPT ); Thu, 5 Oct 2023 10:09:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbjJEOHB (ORCPT ); Thu, 5 Oct 2023 10:07:01 -0400 Received: from mail.smrk.net (mail.smrk.net [IPv6:2001:19f0:6c01:2788:5400:4ff:fe27:adaa]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 940719ECB for ; Thu, 5 Oct 2023 02:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smrk.net; s=20221002; t=1696496532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nyJn+JFuAmnNdt8nzCFIwLmvxSkUqXcw/M6fV+/TJkM=; b=WxIzlQjdiD8scjwmOQZc+xOLShwehualcCh/54hGcGDCW+MzQqwykek7+NJly+5sll3bng 5z8tZk0OpPM8Cis7ajKHWp5xMQATXvFY35Lles1cEXuBd0Fr+kvH46R5NwEmTcAT/9l+c9 hpJ9d2FdnxdtLuQFxCNEy3D1TR5/HkIL2GkZGg5EGDAQGQLVoP4WI5Qng1dTOpu9JxTEj9 AMCeUTwBrihD8HYumi+PuIAAyA2F2WwDE89kFm9CXEwKJ58u5aRlSyyq4j/vcfW8djZYMK s2QJGVUXUU58nhQyQrDdtXa4hoLP7h22PaG/5WnD/1HJKppd4I3zpXU74emPtA== Received: from localhost ( [192.168.5.2]) by smrk (OpenSMTPD) with ESMTPSA id bd7d1c07 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 5 Oct 2023 11:02:12 +0200 (CEST) From: =?utf-8?b?xaB0xJtww6FuIE7Em21lYw==?= To: git@vger.kernel.org Subject: [PATCH v2 3/5] git-jump: admit to passing merge mode args to ls-files Date: Thu, 5 Oct 2023 11:00:53 +0200 Message-ID: <20231005090055.3097783-3-stepnem@smrk.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231005090055.3097783-1-stepnem@smrk.net> References: <20231003082107.3002173-1-stepnem@smrk.net> <20231005090055.3097783-1-stepnem@smrk.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There's even an example of such usage in the README. Fixes: 67ba13e5a4b2 ("git-jump: pass "merge" arguments to ls-files") Signed-off-by: Štěpán Němec --- contrib/git-jump/git-jump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump index 40c4b0d11107..47e0c557e63f 100755 --- a/contrib/git-jump/git-jump +++ b/contrib/git-jump/git-jump @@ -9,7 +9,7 @@ The parameter is one of: diff: elements are diff hunks. Arguments are given to diff. -merge: elements are merge conflicts. Arguments are ignored. +merge: elements are merge conflicts. Arguments are given to ls-files -u. grep: elements are grep hits. Arguments are given to git grep or, if configured, to the command in `jump.grepCmd`.