From patchwork Tue Sep 18 05:47:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 10603743 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0DD5914DA for ; Tue, 18 Sep 2018 05:48:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1FF42A3CD for ; Tue, 18 Sep 2018 05:48:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6BFD2A3E8; Tue, 18 Sep 2018 05:48:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1CBD2A3CD for ; Tue, 18 Sep 2018 05:48:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727252AbeIRLSx (ORCPT ); Tue, 18 Sep 2018 07:18:53 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33878 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726254AbeIRLSw (ORCPT ); Tue, 18 Sep 2018 07:18:52 -0400 Received: by mail-wr1-f65.google.com with SMTP id g33-v6so628266wrd.1 for ; Mon, 17 Sep 2018 22:47:54 -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 :mime-version:content-transfer-encoding; bh=Hv66u5n0D3CJmpMSQqfL6y9HwdrvwQsxuywQBl18EcA=; b=RiB+HVcgEURCaapXg5y3aR0dZ46gA7zed3rC8y30QF1xLHtUZixwpQBoLOHM62/Ziy NEOGfAbl0OyQzp4MGasunkNiQOal5y48RT2PrHHIcc/GXdoXhK1ZufxI4myksw/2n5VR Z/ffoomAHhx4At/cpWhMvCn/yGCg1XJ6zU3B0S6rvmsbKul6GLxlc54hUXWInLUk7g8k e4GSVMzS0fkEgtzNjHefCFoMhOVnbZLmPScSORoU9GwkLMrGmFoFPbS83cQx9DQdacXj zcadHAqMzUGOIUM0nLRfV0+n/O1BACmgBjEzCWYgJsBXRV33zs4Pj1nND+DbBtfRO5JD yUog== 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=Hv66u5n0D3CJmpMSQqfL6y9HwdrvwQsxuywQBl18EcA=; b=ZHxejXCPcQe87VZVjFMPT6EtfO+ueHm18Ew/ctlhxJSTWu/bxbe8NxHbsUNgMD9hRl iDSiOkdBI++AtIIB6xdN1JkHmhzYfZ65tr9Myo7vfFQVy6xcGG94/rTF5UD50vKOlcoJ d4YmJrrBLftT2+vs/nbOh/iO4N10HXJh91s/jDI5Pl5B0553jFMWPsINKZTDL8PFslFW OZ1sS4mGSmQtRvPj9kQd5dAlly+0L3l8R/LHbySk5WxHATCgScw3ZACCrrs9KrM8K4NV 9b0fL4JxI+7ernN1VFB49MtBJnC3MSmO9vzc/M7afdt55yIp+6JHVgTDLLQw1WQ1PB6+ fIOA== X-Gm-Message-State: APzg51CpsCB7wXVBJc87N3nndXeHSLXfacxGGemzZcZxDnZPfSFiu0zP EFh629MMGjkTNE3VMlUeQm9jMsOD4xU= X-Google-Smtp-Source: ANB0VdbWSzYorRvNy8D5VdQCCSGKcH9+NRS32zsGNs/uQsyDBzaDJYdDgRRCtv9V3bIpU5iCQJUXbg== X-Received: by 2002:a05:6000:104a:: with SMTP id c10mr20216681wrx.271.1537249673209; Mon, 17 Sep 2018 22:47:53 -0700 (PDT) Received: from u.nix.is ([2a01:4f8:190:5095::2]) by smtp.gmail.com with ESMTPSA id 132-v6sm881398wmd.13.2018.09.17.22.47.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Sep 2018 22:47:52 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 1/3] push doc: add spacing between two words Date: Tue, 18 Sep 2018 05:47:38 +0000 Message-Id: <20180918054740.24180-2-avarab@gmail.com> X-Mailer: git-send-email 2.19.0.rc2.392.g5ba43deb5a In-Reply-To: <20180918054740.24180-1-avarab@gmail.com> References: <20180918054740.24180-1-avarab@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix a formatting error introduced in my recently landed fe802bd21e ("push doc: correct lies about how push refspecs work", 2018-08-31). Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-push.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index f345bd30fc..a5fc54aeab 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -110,7 +110,7 @@ can be overridden by adding an the optional leading `+` to a refspec is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object. Hooks and configuration can also override or amend these rules, see e.g. `receive.denyNonFastForwards` in -linkgit:git-config[1] and`pre-receive` and `update` in +linkgit:git-config[1] and `pre-receive` and `update` in linkgit:githooks[5]. + Pushing an empty allows you to delete the ref from the From patchwork Tue Sep 18 05:47:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 10603739 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 820A2161F for ; Tue, 18 Sep 2018 05:48:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7282E2A3C6 for ; Tue, 18 Sep 2018 05:48:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 669E32A40C; Tue, 18 Sep 2018 05:48:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E327B2A3DF for ; Tue, 18 Sep 2018 05:48:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727404AbeIRLSy (ORCPT ); Tue, 18 Sep 2018 07:18:54 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35345 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726254AbeIRLSy (ORCPT ); Tue, 18 Sep 2018 07:18:54 -0400 Received: by mail-wr1-f67.google.com with SMTP id j26-v6so622756wre.2 for ; Mon, 17 Sep 2018 22:47:55 -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 :mime-version:content-transfer-encoding; bh=D45p/hPgcvprVWO3rqjXn3IazaYiSRGBu2ASwHbvLEQ=; b=si15/p0Qeq+e0DWAXomged0hPBEZbpRGVBGsV435kLAVrpjTMz3nfycrl7Gh+M4GNL DG5Zp5N0w5N/HrqzrnzB0MbmfZ5n6gTNS71kz+BbjgNC3CZNfuQ7agnzNzAS87UfvaA6 7NSbqYcouWyGJjg5ighwhyn4+Pjw5vvVrZRqvtA0yv1lfLAZ7seCCtNDelCOc+JtDloA NuiKdZxF4OIhuPCAWlIqTIJu7brxzIir6CO6x17sWERt9TFf0bYOcm2XtkF640CqCoSt VndbSdLau/URmiCBUFNEEpg08Jd1QQVQFbqTAGI0YsXy5APMi+xZWg3myu9ApYS5aXUI vS2A== 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=D45p/hPgcvprVWO3rqjXn3IazaYiSRGBu2ASwHbvLEQ=; b=RpGiFNMgUPV/KHV3Qbon+7DZaGm6oZ24lA5CPhn+WHP4jvGAjtC/j/B6mc8bfBgQ6w K/15Lqpztns5Giw48PHxU9JIgVOgBtOepmU17xnZCZPbFoPgR9udrmZ+AjFM5uDClzWN yZz+7y5hz9eLa5/cE7kS88WVZWYc7hI6nYbIm01OFC927lb99dYiiV/wfc0dsNejDgCg 3bHEQIku5tPxGiGujw82ObSVDkGcPzjdxoRBFFHFAkO8ysYKoYRCbs7+2M2A2yyLNERD 98E8n0LJbuOS654MHfED9ziRBF/VfC8+w/pAntqTYcW00R0xrRm9728j4YHJ3BCvFQwl B+CQ== X-Gm-Message-State: APzg51BhZyIxylWBZcvPPoalS0mqqCRPn2BDmtg/yj8bzydEgxnfgi60 1qbTwQ4/2Nx91RYP+lnOwrqjm8NRmNE= X-Google-Smtp-Source: ANB0VdaojIS7UBfczNsU+0Kl1cDMYVDRMmfhjGDLQplBuAicVnGMEklfTKUpIVotqwjYedHU2E5R+Q== X-Received: by 2002:adf:8b98:: with SMTP id o24-v6mr21496200wra.110.1537249674669; Mon, 17 Sep 2018 22:47:54 -0700 (PDT) Received: from u.nix.is ([2a01:4f8:190:5095::2]) by smtp.gmail.com with ESMTPSA id 132-v6sm881398wmd.13.2018.09.17.22.47.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Sep 2018 22:47:53 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 2/3] fetch doc: correct grammar in --force docs Date: Tue, 18 Sep 2018 05:47:39 +0000 Message-Id: <20180918054740.24180-3-avarab@gmail.com> X-Mailer: git-send-email 2.19.0.rc2.392.g5ba43deb5a In-Reply-To: <20180918054740.24180-1-avarab@gmail.com> References: <20180918054740.24180-1-avarab@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Correct a grammar error (saying "the receiving" made no sense) in the recently landed documentation added in my 0bc8d71b99 ("fetch: stop clobbering existing tags without --force", 2018-08-31) by rephrasing the sentence. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/pull-fetch-param.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 293c6b967d..2b1fbe03aa 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -45,7 +45,7 @@ rules particular to 'git fetch' are noted below. + Until Git version 2.20, and unlike when pushing with linkgit:git-push[1], any updates to `refs/tags/*` would be accepted -without `+` in the refspec (or `--force`). The receiving promiscuously +without `+` in the refspec (or `--force`). When fetching, we promiscuously considered all tag updates from a remote to be forced fetches. Since Git version 2.20, fetching to update `refs/tags/*` work the same way as when pushing. I.e. any updates will be rejected without `+` in the From patchwork Tue Sep 18 05:47:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 10603741 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9B02717E1 for ; Tue, 18 Sep 2018 05:48:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C6492A3DF for ; Tue, 18 Sep 2018 05:48:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78FF22A40D; Tue, 18 Sep 2018 05:48:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10CAD2A3E8 for ; Tue, 18 Sep 2018 05:48:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727622AbeIRLS4 (ORCPT ); Tue, 18 Sep 2018 07:18:56 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:52248 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726254AbeIRLS4 (ORCPT ); Tue, 18 Sep 2018 07:18:56 -0400 Received: by mail-wm1-f68.google.com with SMTP id y139-v6so972913wmc.2 for ; Mon, 17 Sep 2018 22:47:57 -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 :mime-version:content-transfer-encoding; bh=yYrNL2V91b8hi6xcX9KWpjL6jRVwusyqKgFPsi0VrrE=; b=b+1Se1MCIMZcxBEgRVu7BvaYjwkLb74qBkPfnYw0SLXh0v+G5bXae1Bh8QiSDHoJsC qhIsFhWussxcTwJ2c+9u6U7a0lHfxX/kEsFGc2h/UNSJ83EWF8/TPKsVpVXccEIr2aAz HfjiUe6YuRNFrSusA1pgSqavwaPcInwDFnaXb+jf/CozibpgJ4tGYUVosX1znjlA/p3v m2oq2NkctlZKFIDsYFGO6Gi1jj+fOC+uCuFyPkc8dU5VH7x5pOfHKkiTI8uejhDm8IHf K9mLEIZbNTPnjfsWq3vC1l5Zvf97t9KjC8AbQytmAcxStxyxGmQy/C1IT3wRtiGsX/KH AdkA== 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=yYrNL2V91b8hi6xcX9KWpjL6jRVwusyqKgFPsi0VrrE=; b=akEgkoDtrvC/cpKFUxkKubVrtXtiYg2h809DGHFOrP4Qd9OGbQ1Q6RO5lO0+yFnV29 s4JcuxkCDL+MltGaID6j5TERmCjv6JDyM4Fp90rkYm3CdAPkJ1CutUDSifPlX3y9FSDu FuEYSu4/Whh6saZxPkNHXgoaI9bdtnjkPEvE/OvpS8O1EazbPSpKm7pqAnWgusccQ0/r OjYLzxHz1SVda2xqzsuwRYQyPPldyHChT4YCo5BR7vyG1co7erQ9ZwkTy8oONvteBtAy N1XZuRsCS+M56bcOMWQH+9hyvIrm0m2LiQrlEQJyFWXXwdafTx1mEJB7wG8cFKCtHOhz kScA== X-Gm-Message-State: APzg51BwiyTdJXEls5bsClk754KTHFhStxUMFYFofkQrnYqu0xhfUVc2 WlqtQPUqmVxbIPywCpILTVSIgGpgEfA= X-Google-Smtp-Source: ANB0VdauA00cdaY7aceNlM7mOOmZOVME8fZ+Gg48yGUC2q+88uu62eprFJrg0NBLXJjYCpBNIMftwQ== X-Received: by 2002:a1c:cbc1:: with SMTP id b184-v6mr14391367wmg.149.1537249676512; Mon, 17 Sep 2018 22:47:56 -0700 (PDT) Received: from u.nix.is ([2a01:4f8:190:5095::2]) by smtp.gmail.com with ESMTPSA id 132-v6sm881398wmd.13.2018.09.17.22.47.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Sep 2018 22:47:55 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 3/3] fetch doc: correct grammar in --force docs Date: Tue, 18 Sep 2018 05:47:40 +0000 Message-Id: <20180918054740.24180-4-avarab@gmail.com> X-Mailer: git-send-email 2.19.0.rc2.392.g5ba43deb5a In-Reply-To: <20180918054740.24180-1-avarab@gmail.com> References: <20180918054740.24180-1-avarab@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP "Work the same" is incorrect and needs to be "Works the same way". Fixes grammar in document anion I added in the recently landed 0bc8d71b99 ("fetch: stop clobbering existing tags without --force", 2018-08-31). Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/pull-fetch-param.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 2b1fbe03aa..7d3a60f5b9 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -47,7 +47,7 @@ Until Git version 2.20, and unlike when pushing with linkgit:git-push[1], any updates to `refs/tags/*` would be accepted without `+` in the refspec (or `--force`). When fetching, we promiscuously considered all tag updates from a remote to be forced fetches. Since -Git version 2.20, fetching to update `refs/tags/*` work the same way +Git version 2.20, fetching to update `refs/tags/*` works the same way as when pushing. I.e. any updates will be rejected without `+` in the refspec (or `--force`). +