From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id BC9311F576 for ; Fri, 9 Feb 2018 11:04:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752246AbeBILE4 (ORCPT ); Fri, 9 Feb 2018 06:04:56 -0500 Received: from mail-pl0-f68.google.com ([209.85.160.68]:45732 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752233AbeBILEx (ORCPT ); Fri, 9 Feb 2018 06:04:53 -0500 Received: by mail-pl0-f68.google.com with SMTP id p5so1313295plo.12 for ; Fri, 09 Feb 2018 03:04:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EIcVmXWRQKWd374vMeYHpuUL2suGaQF+tjS721+Pw98=; b=KGsHG3DBdF8yeL8XpamInxhZVTwZ2ABC09eblc7jd7/pu8uy6ycXpoUFA4/5mT6JI8 11qCGkbAx6MeeAI6HWwfRUSbehGr80X3VK2+iUVERJCRJC85WgfDlzoB0Ek/NkG6FFPF 9m+K+bFLDTqxctA0TlmKBkttXSb99rY557bRII22vsocMukhWNpqwkb9snFTfNi8LJ37 MpFEGVcH91yIb72EhLloxNtpY1QsDCV9peNpcn22GcLeQJNn6/Rogopw2aMlJr/+doKM Yb9JaN3o2S6SxfhPHXf+pi6UGgjkBx0eCGmEPj4ioh3YNDr+2Adae+52LVh70Tk++XY/ rugw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EIcVmXWRQKWd374vMeYHpuUL2suGaQF+tjS721+Pw98=; b=Gc5gkqRx5lhTSL9I+d9V9jHU5vmsRdDXuIHC8KuS9eSVl5dAxsCGmBNnWn1VeZQi3z M109s+Q8mFg32/pdYA1Qno0T2a9W8B1JRlhzxYvHRBu8LrFNnGZyDUQWsikBjXuHEl1a 8ucOIgBo9uXKyt8kenDrGOdOK0DdjHvSe00E0tmzwwSwJDSodduaw49bKxCVlYLl3LYv WGFuRf6q91VoOCfh/zRqk/actsO0LRn38wh9BqtkG4makQOOJT3Qlj3fZVO1rJUY0mrV cQfjH0IOgd21x6aChzP9oQ07yOBwLBALs4g0YHvD/XjUJ+zWAtghOoq3r6Uc/ns+J6yv 5JHw== X-Gm-Message-State: APf1xPApWRvL0PsQyTyP3T4lAOT1UYOTfMSDIxQWGD06HO8poEBbhzDs crOcs3+yQ0KkKBJrNNRw5v/LJQ== X-Google-Smtp-Source: AH8x224oWOpqzfSeeYxYPSmcbuOrBfn6s8fjfdlFw0a6iRtsCmcbrHNJ5p0ihNPHxpgnfDSgyFg/pQ== X-Received: by 2002:a17:902:bf0a:: with SMTP id bi10-v6mr2236809plb.181.1518174292821; Fri, 09 Feb 2018 03:04:52 -0800 (PST) Received: from ash ([171.232.93.137]) by smtp.gmail.com with ESMTPSA id g27sm6258554pfa.25.2018.02.09.03.04.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 03:04:52 -0800 (PST) Received: by ash (sSMTP sendmail emulation); Fri, 09 Feb 2018 18:04:48 +0700 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org Cc: Junio C Hamano , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , Eric Sunshine , =?UTF-8?q?SZEDER=20G=C3=A1bor?= , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v3 25/42] completion: use __gitcomp_builtin in _git_merge Date: Fri, 9 Feb 2018 18:02:04 +0700 Message-Id: <20180209110221.27224-26-pclouds@gmail.com> X-Mailer: git-send-email 2.16.1.207.gedba492059 In-Reply-To: <20180209110221.27224-1-pclouds@gmail.com> References: <20180131110547.20577-1-pclouds@gmail.com> <20180209110221.27224-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org New completable options are: --allow-unrelated-histories --message= --overwrite-ignore --signoff --strategy-option= --summary --verify The variable $__git_merge_options remains because _git_pull() still needs it. It will soon be gone after _git_pull() is updated. Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e22ea60bc8..4f598820cd 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1768,8 +1768,13 @@ _git_merge () case "$cur" in --*) - __gitcomp "$__git_merge_options - --rerere-autoupdate --no-rerere-autoupdate --abort --continue" + __gitcomp_builtin merge "--rerere-autoupdate + --no-rerere-autoupdate + --no-commit --no-edit --no-ff + --no-log --no-progress + --no-squash --no-stat + --no-verify-signatures + " return esac __git_complete_refs -- 2.16.1.207.gedba492059