From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id B10041F406 for ; Sun, 13 May 2018 02:24:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751936AbeEMCYW (ORCPT ); Sat, 12 May 2018 22:24:22 -0400 Received: from mail-ua0-f193.google.com ([209.85.217.193]:36840 "EHLO mail-ua0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751851AbeEMCYV (ORCPT ); Sat, 12 May 2018 22:24:21 -0400 Received: by mail-ua0-f193.google.com with SMTP id b25-v6so6129699uak.3 for ; Sat, 12 May 2018 19:24:20 -0700 (PDT) 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; bh=OLS7UF8b/+GDjrrPTOkEYv+uBTsa5GmpL/4wigcwFvs=; b=b+HkPFu/ZWARdpb0IKpCkpqc+C7HR2pQ2B5g/OYxJXlAG2Oso9PtaAxpEH3lX1SRzI nW45s76Ewdv7ge71JjW0h4S9C4XR91qyr7NG9DDQQRiMycjBpngUZH0cqmJL/6ZUUP52 /UyxTbU2sUzvM41qSSovWZPcs2mSg6mKkenDVf5bzAeShe+LEA7oOgaUf6S+K9UDuGgZ rYVq7X+U+QMncVyIkG1R9Epjw6GzyUnfea5i0gXmckoWKvdUZbIx0B4wud+9kHNsGqyU u272dUTXWxNvXFOEZTHq8zPJwsJj6dkQhtaSIJxbJOAntjmmtJ9ac8c9OS63y7RoT3yL BtAg== 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; bh=OLS7UF8b/+GDjrrPTOkEYv+uBTsa5GmpL/4wigcwFvs=; b=dnYEAh2DSpXorEMRomLs1gN0xKOsUXnSSNGkCVbkMeFEmdjWH5ncaJvlnGLH3Rbf4P zfwH9yAvMGJw4qbz3ZQQ8STTp1CH///xqGmNzX1gLC5qvsPezQMGL8JbYHGccm+VqudJ ALD59tndQ1brjZ4xpXsSbFqt+yUGqHjbwYne2j7xm20Eb0Z5aNmPB1JlpxETK50Q6Vc4 OIGetvhJy0OXV2e7SellV1z6q3N9s64qRV9+XNe5i4QyPYkEjKuo8g/BVcrrnjr0irus 1i8ra9g0psN2jLXklt+LxMj/rsUYIIRxxk5DbzGMKs9lNZ5be4eysFOdQ3nBomAGwzzN BPpQ== X-Gm-Message-State: ALKqPwdj/GjN/si4QgxS0IutLSbbwsj0a9uevNRiKaRP7NMgvqfdPXV2 rLKiBinsMSymqbJB05ljutvf44o= X-Google-Smtp-Source: AB8JxZrqdTpKagdMTSHV6auxVLj5fm6ev9x4WUBSv9R3D2XuJOD+STDUf1J8NIuBp0Izq7MU/n0emA== X-Received: by 2002:ab0:d88:: with SMTP id i8-v6mr7153057uak.67.1526178260007; Sat, 12 May 2018 19:24:20 -0700 (PDT) Received: from localhost.localdomain (ip177-101-15-186.ct.co.cr. [186.15.101.177]) by smtp.gmail.com with ESMTPSA id o24-v6sm1541308vki.33.2018.05.12.19.24.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 12 May 2018 19:24:19 -0700 (PDT) From: Dannier Castro L To: git@vger.kernel.org Cc: Dannier Castro L , gitster@pobox.com, Matthieu.Moy@imag.fr, jrnieder@gmail.com, bmwill@google.com Subject: [PATCH 3/3] doc: update doc for strict usage of -- checkout Date: Sat, 12 May 2018 20:23:34 -0600 Message-Id: <1526178214-30956-3-git-send-email-danniercl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526178214-30956-1-git-send-email-danniercl@gmail.com> References: <1526178214-30956-1-git-send-email-danniercl@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The flag '--' must always be before any file path when command is used. The main documentation about the usage of command is updated to include the strict usage of the flag '--' so that the user can specify file names over branch names. Signed-off-by: Dannier Castro L : --- Documentation/git-checkout.txt | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index ca5fc9c..8360a98 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -12,9 +12,9 @@ SYNOPSIS 'git checkout' [-q] [-f] [-m] --detach [] 'git checkout' [-q] [-f] [-m] [--detach] 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] ] [] -'git checkout' [-f|--ours|--theirs|-m|--conflict=