From patchwork Wed May 6 17:11:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shourya Shukla X-Patchwork-Id: 11531573 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E4CE81 for ; Wed, 6 May 2020 17:11:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B2822080D for ; Wed, 6 May 2020 17:11:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Yq1xLTcp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730077AbgEFRLq (ORCPT ); Wed, 6 May 2020 13:11:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727984AbgEFRLq (ORCPT ); Wed, 6 May 2020 13:11:46 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCCACC061A0F for ; Wed, 6 May 2020 10:11:45 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id f8so764933plt.2 for ; Wed, 06 May 2020 10:11:45 -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:mime-version :content-transfer-encoding; bh=kOUXWnKVVNY07x46K9+05zWijgWjrRUXm0vAdRPb8HA=; b=Yq1xLTcp5gM0SuXARiS1xal5ioRlOcj12nfx4I/sMvpc/8UR9anqOqOSnDi65JfEtg V6wDZOzsgGYZlOA15//8lXl0rlfUbUwBCqbHGA7DI68lltqbn4OFOnNlzMcM9NxvMYDT HGGQ4Ss0TSIPfo9StN7mKnI5cP8rO8DS4DuAFf7wFsOp7D9t/JiRfZDqGNoO+bw38LR0 3lebs9oAEfW1ZLO9RTu47i/YNkrOtgjw9qp07TxrdJbO1uDJN5o6fumE2XBaR+qZay0j urGYcJjQWa5JyFQ6zwnWM34oi/9ILh6zi1dp+43BQi6fE1DpiccWZoVydl2VSLlfATGW rEcQ== 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:mime-version :content-transfer-encoding; bh=kOUXWnKVVNY07x46K9+05zWijgWjrRUXm0vAdRPb8HA=; b=T3pi7BuXjiFNqZ32kXtE1gnA7/kYCcysCcmkd4zdbAGWikwFw//vw2gwXJQ+K3BGaF JzA0oiQk63MNCOiiVgaomIW97Z6oZDw7qCvMWS4VQiKNU20a8rGdWAXQVSYwZe+FqiBW eGO6oSI5hEuhvohWVNKecEQZVjxuSf2GGKTKuMEeeRChbOIIgvSJpyb2qggEzs6f1pom I9Vk5QqYLZxsfUhfO3y0Zg7W0qqW7NQfPDjaY8eVQSGdJA+Z+FwUn/EzyvgmFDv7x3fa 7XysfXmQiuQ+FBsSl7I8dHGogvQNi4Zt7+0YqeksNmLvJluuLIt6sMiwYo+eqhNDV3L4 NKiQ== X-Gm-Message-State: AGi0PuYncTGZsw1DKVybT3ZHa/hRsCOYbW3WVjPZdGBBa+AJ3z2Em5/+ wCtOWsMAPr2TL6K+gTSP0kC00WZfUn8nnoq/ X-Google-Smtp-Source: APiQypJGKHXh0M3Y/Jlk9FqYe11OTr2QixKWPxYj5IVPVZn9DHVP89gEZKAWn6+qwpg3bWH0njf7BQ== X-Received: by 2002:a17:90b:93:: with SMTP id bb19mr10376609pjb.134.1588785104665; Wed, 06 May 2020 10:11:44 -0700 (PDT) Received: from konoha.iitr.ac.in ([103.37.201.172]) by smtp.gmail.com with ESMTPSA id 6sm1961273pgw.47.2020.05.06.10.11.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 10:11:43 -0700 (PDT) From: Shourya Shukla To: git@vger.kernel.org Cc: gitster@pobox.com, newren@gmail.com, sandals@crustytoothpaste.net, Shourya Shukla Subject: [PATCH v7 1/4] gitfaq: files in .gitignore are tracked Date: Wed, 6 May 2020 22:41:07 +0530 Message-Id: <20200506171110.23124-1-shouryashukla.oo@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add issue in 'Common Issues' section which addresses the problem of Git tracking files/paths mentioned in '.gitignore'. Signed-off-by: Shourya Shukla --- Documentation/gitfaq.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index 1cf83df118..11d9bac859 100644 --- a/Documentation/gitfaq.txt +++ b/Documentation/gitfaq.txt @@ -223,6 +223,16 @@ a file checked into the repository which is a template or set of defaults which can then be copied alongside and modified as appropriate. This second, modified file is usually ignored to prevent accidentally committing it. +[[files-in-.gitignore-are-tracked]] +I asked Git to ignore various files, yet they are still tracked:: + A `gitignore` file ensures that certain file(s) which are not + tracked by Git remain untracked. However, sometimes particular + file(s) may have been tracked before adding them into the + `.gitignore`, hence they still remain tracked. To untrack and + ignore files/patterns, use `git rm --cached ` + and add a pattern to `.gitignore` that matches the . + See linkgit:gitignore[5] for details. + Hooks ----- From patchwork Wed May 6 17:11:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shourya Shukla X-Patchwork-Id: 11531575 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 99DA481 for ; Wed, 6 May 2020 17:11:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 818882080D for ; Wed, 6 May 2020 17:11:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="o/ASG/Px" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730138AbgEFRLt (ORCPT ); Wed, 6 May 2020 13:11:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730058AbgEFRLs (ORCPT ); Wed, 6 May 2020 13:11:48 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8499C061A0F for ; Wed, 6 May 2020 10:11:48 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id f8so764980plt.2 for ; Wed, 06 May 2020 10:11:48 -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=eNlZHvW1cgA6bCjxfw3juRdvEUSWfAvm7+3h/d3dAX0=; b=o/ASG/PxiFCM5WpswmLkOb61VokVBRvGofoITsuHCJI/HY41uaCsEsg9osuf70e+G+ /+EYw+J2LaLds0QHqo9KVjqtB/QTJ7Hk+3gj65DoHdInYrQeLgAdIWfVHnLXBKbKoe6W W2I7rcbOm/7SxmObWz8jjBOhDc6hNgeG2paXFXAoqJdcnHcAMafw78gU4OC+hz+WpGv0 pjC4+yO7NzJqLsZXIwGHcgB0VM7u0REcT4pyBXMxYgnTvXKhNhKsVFH/4/UHDWA6UxxL jKJCsX82ANTRHMuKyymZfPIzjYTgamP9jjvQDTonz58oBJwcP4lfbF72EPmCmsvCB14t AFtQ== 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=eNlZHvW1cgA6bCjxfw3juRdvEUSWfAvm7+3h/d3dAX0=; b=uO4+RjF1RmusXo66ijmohSCwTzHSCAp/cpKLPk7R149xNppRe2iR/YT/UEvDgxm0iC VcS0O+ap6wJ1u6pdC0EUwmn+rHJKAVRPjBcEQQZMla4NOYMerz2CXhdWyaAKXqRh00nH WTkjB1thGLOPE0K7r0VIqt280DVDNdK3v+cYriL7JX8G5j7LhHVRUgBsBlugfSBWZZGX itayknRLJ30c4IM+Kyj86bcvQFoVavu4QeP4TdzkQp9cUSFkOQjKqIiDfoR1ubffzJxA alnJCRC0xeV206XPoZJjQET/TA+bBsikXGdMHXUdlQhiVq+u2ccrE6OsI+4YI7L6l6lF s22Q== X-Gm-Message-State: AGi0PubNW3Hip2CiiWhxNrupZePBw0DOtVu2UlxTQr2EtZcNDhcZrfXc 7bCZpefRAo0M4F/N8J5rfjXlzXZgH5sPqItr X-Google-Smtp-Source: APiQypJdEN8cJNgwUarSeHDKVCfZWd+G7X3aIITh0863MHP1sNStXykjqZ5VlTaSWTNko6lZqK7wKg== X-Received: by 2002:a17:90a:c7c8:: with SMTP id gf8mr8268604pjb.226.1588785107690; Wed, 06 May 2020 10:11:47 -0700 (PDT) Received: from konoha.iitr.ac.in ([103.37.201.172]) by smtp.gmail.com with ESMTPSA id 6sm1961273pgw.47.2020.05.06.10.11.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 10:11:46 -0700 (PDT) From: Shourya Shukla To: git@vger.kernel.org Cc: gitster@pobox.com, newren@gmail.com, sandals@crustytoothpaste.net, Shourya Shukla Subject: [PATCH v7 2/4] gitfaq: changing the remote of a repository Date: Wed, 6 May 2020 22:41:08 +0530 Message-Id: <20200506171110.23124-2-shouryashukla.oo@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200506171110.23124-1-shouryashukla.oo@gmail.com> References: <20200506171110.23124-1-shouryashukla.oo@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add issue in 'Common Issues' section which addresses the problem of changing the remote of a repository. Signed-off-by: Shourya Shukla --- Documentation/gitfaq.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index 11d9bac859..875cfa0acd 100644 --- a/Documentation/gitfaq.txt +++ b/Documentation/gitfaq.txt @@ -233,6 +233,17 @@ I asked Git to ignore various files, yet they are still tracked:: and add a pattern to `.gitignore` that matches the . See linkgit:gitignore[5] for details. +[[changing-remote-of-the-repository]] +I want to change the remote of my repository. How do I do that?:: + A remote is an identifier for a location to which Git pushes your + changes as well as fetches any new changes from (if any). There + might be different circumstances in which one might need to change + the remote URL (see linkgit:git-remote[1]). To change the remote URL + one may use: git remote set-url ++ +One can list the remotes of a repository using `git remote -v` command. +The default name of a remote is 'origin'. + Hooks ----- From patchwork Wed May 6 17:11:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shourya Shukla X-Patchwork-Id: 11531577 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7507781 for ; Wed, 6 May 2020 17:11:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A5A62080D for ; Wed, 6 May 2020 17:11:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lWgfCrwi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730183AbgEFRLx (ORCPT ); Wed, 6 May 2020 13:11:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730058AbgEFRLx (ORCPT ); Wed, 6 May 2020 13:11:53 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D04C4C061A10 for ; Wed, 6 May 2020 10:11:51 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id t40so1191943pjb.3 for ; Wed, 06 May 2020 10:11:51 -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=dk1iYYeHAHOdvJoBLT+K1slXrSHJ9o3vjc444475nhE=; b=lWgfCrwiTmyqqP4vhJEOUBOT0YMGs94dQwvtNNDo4vXzNgLdFILRvXFK5jRC5qKqx3 avHQsgA6VvG8s3xIjHQI5jPA7hw6/F4vSFHzYpKM45Umg54KykBq2Z4RJER2Fo6IRjXZ yVIxE0uEvtXMZktu3zKjTqKmPm9syWv7RCKHCeld0XVolma7iBeKOfVaZqqyzSnbO4AU srdpJPrTtIauwKDYwijygIb3tcz9i4Mce0JczmsRdc5OnTD5/iZ9NDx6+4OpDp7YYOza d/INrqvH2eXGYJoXl3rMSSKmAi5FIdP4zOiJfl9eycsMCnoTbfVy5AJ7U5Xwzg0SEYMT owHQ== 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=dk1iYYeHAHOdvJoBLT+K1slXrSHJ9o3vjc444475nhE=; b=NbYDBArd9E1BDyauPOSrOFUxwTjCxoLHoOg9LH09PhD+9jCLOfrp/ZDnQmZYvY7esc nRyXlNd3lDN6CAzfGl9vNut0uWMdTiZIBITqQpMPUDlwh9OU0LF2UIuqCm3vRoFHhY+f Re2vphgM/mYSPlZNf4vx3BUszYOw68Rn8AkOj0oG3/TR/LyxK2g1f8tlAoXzy+EkEWkK ZHe4apdG76mHcaQVuzihq6d7/rneTXnpeDsPc4JWwe+Bg8SPhGbEmBFDP9ttwxbrHYXk 7eVv7n6r13kCvqtFdqMexTIT2rV+mHq5ZYyWD5kE7EtQRtCpUl+O8RasBAN6JFbhnGw/ anmQ== X-Gm-Message-State: AGi0PuZqFed2Ega8Bm0pDECDdQbXSJXaNZbnFtB3B6LJua/oyy8TNiNC JjcuPRkx9IMYF5ICrpEVHuBEgXqQhkbQZwrx X-Google-Smtp-Source: APiQypJZPB77iD9yGqzD/mx3BnjWQwAekUWZ9JAS7XykdIOVDGdHTqGXNqqufvIVhdBiZEreA32uow== X-Received: by 2002:a17:902:778a:: with SMTP id o10mr8708827pll.76.1588785110710; Wed, 06 May 2020 10:11:50 -0700 (PDT) Received: from konoha.iitr.ac.in ([103.37.201.172]) by smtp.gmail.com with ESMTPSA id 6sm1961273pgw.47.2020.05.06.10.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 10:11:50 -0700 (PDT) From: Shourya Shukla To: git@vger.kernel.org Cc: gitster@pobox.com, newren@gmail.com, sandals@crustytoothpaste.net, Shourya Shukla Subject: [PATCH v7 3/4] gitfaq: partial cloning a repository Date: Wed, 6 May 2020 22:41:09 +0530 Message-Id: <20200506171110.23124-3-shouryashukla.oo@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200506171110.23124-1-shouryashukla.oo@gmail.com> References: <20200506171110.23124-1-shouryashukla.oo@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add issue in 'Common issue' section which covers issues with cloning large repositories. Use partial cloning to selectively clone the repository. Signed-off-by: Shourya Shukla --- Fixed a whitespace error pointed out by Elijah. Documentation/gitfaq.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index 875cfa0acd..5a6c8fb07e 100644 --- a/Documentation/gitfaq.txt +++ b/Documentation/gitfaq.txt @@ -244,6 +244,17 @@ I want to change the remote of my repository. How do I do that?:: One can list the remotes of a repository using `git remote -v` command. The default name of a remote is 'origin'. +[[partial-cloning]] +The repository I am trying to clone is too big. Is there an alternative +way of cloning it in lesser space?:: + A good way to save space when cloning a repository is by using + `partial clones`. A partial clone will clone the full history of + the repository but will skip out the entities specified by the + `--filter` option one uses in `git clone`. Any entity which has + not been cloned to save space can be cloned on-demand (hence this + presumes that the user has an always-on network connection to the + original repository). See linkgit:partial-clone[1]. + Hooks ----- From patchwork Wed May 6 17:11:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shourya Shukla X-Patchwork-Id: 11531579 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A962D92A for ; Wed, 6 May 2020 17:11:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90D602080D for ; Wed, 6 May 2020 17:11:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Tmu4mXyV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730203AbgEFRLz (ORCPT ); Wed, 6 May 2020 13:11:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730058AbgEFRLz (ORCPT ); Wed, 6 May 2020 13:11:55 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4248C061A0F for ; Wed, 6 May 2020 10:11:54 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id t7so770600plr.0 for ; Wed, 06 May 2020 10:11: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=DXES6LnLl7XKlVQpdOcIbI1nsq1T/p8LTJ8xoAU1e6Y=; b=Tmu4mXyVOF8D2tTmkJQ7abKh+6VC8XYxOWkSAcx2ZWHrYlpqnyppUJS48rxDs1F/ej m8D1ssat3xj7AQBOisLXs/mEa5QeAB6muwAqNJPqTHjWaFyCPw3PFzfTTW9RzImfKzgP UuBJkvCQX6t9C5PGnpUd9qeeqk8uNzBupRtT5sebJFgd5nEsUnroRQWUw8igVvbc3S1N n2UjKoEBWermq+NglQdBubfPEf3/IJnHxbc1nIDgSt5KNE6F7opL4OgsKffyFK0GITcM RB7/NUQt/O7jXKcfqmZKcdnFkZ0FAlWgtw2U4KLrhR+O8J8NQ2JAHRSNZvJyHXlqseWQ +8qg== 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=DXES6LnLl7XKlVQpdOcIbI1nsq1T/p8LTJ8xoAU1e6Y=; b=tQ47rxwPD38N2OJF0uvC03JO9VEOvsyTxHnfrTa4qCWPyp37vPD+j6lWkApqRFfoOE ng6kFDeKRdb7VHgOkVk1v+E8I8fXUJgD9ZxPyUJ96ejdmHhoxAUqHcqmruAKZVwesSUG EK+cl0FOeEiQea+p/zd7sSl7zyicBwhSKNcdFtSBFGBxRtIIxui/TTB/OKaPKlbbNzOY mDJMspzVo6VKCchGXAb8xfkZgfrh0UMTz/S18rPWqXfITC0SDZs71g6X835aneAed1Qj mHlH0QHDoovRBN629ILOdAUpsOBu4AILvRqh/SJPF4lnkvcquPKkQghDxZiWjNR7SEOK 0rVg== X-Gm-Message-State: AGi0Pub9noJKJBC3IgRh0+xp+VA4U9ofxtLUIQR5CmckKnVfg/pvRnKj LZmgyG0Z9qJhEJezoTcHpfwPELkNr4v/8VKd X-Google-Smtp-Source: APiQypJN0BhtvStiqVxx15eniaEUhIH5HOmGueZ12z/WuEc7UUlz9avwdkdtufqlkd7CMK8c4rYeOw== X-Received: by 2002:a17:902:784c:: with SMTP id e12mr8733495pln.191.1588785113823; Wed, 06 May 2020 10:11:53 -0700 (PDT) Received: from konoha.iitr.ac.in ([103.37.201.172]) by smtp.gmail.com with ESMTPSA id 6sm1961273pgw.47.2020.05.06.10.11.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 10:11:53 -0700 (PDT) From: Shourya Shukla To: git@vger.kernel.org Cc: gitster@pobox.com, newren@gmail.com, sandals@crustytoothpaste.net, Shourya Shukla Subject: [PATCH v7 4/4] gitfaq: fetching and pulling a repository Date: Wed, 6 May 2020 22:41:10 +0530 Message-Id: <20200506171110.23124-4-shouryashukla.oo@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200506171110.23124-1-shouryashukla.oo@gmail.com> References: <20200506171110.23124-1-shouryashukla.oo@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add an issue in 'Common Issues' section which addresses the confusion between performing a 'fetch' and a 'pull'. Helped-by: Elijah Newren Signed-off-by: Shourya Shukla --- Fixed a whitespace error pointed out by Elijah. Documentation/gitfaq.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index 5a6c8fb07e..208e5e5b82 100644 --- a/Documentation/gitfaq.txt +++ b/Documentation/gitfaq.txt @@ -255,6 +255,14 @@ way of cloning it in lesser space?:: presumes that the user has an always-on network connection to the original repository). See linkgit:partial-clone[1]. +[[fetching-and-pulling]] +How do I know if I want to do a fetch or a pull?:: + A fetch stores a copy of the latest changes from the remote + repository, without modifying the working tree or current branch. + You can then at your leisure inspect, merge, rebase on top of, or + ignore the upstream changes. A pull consists of a fetch followed + immediately by either a merge or rebase. See linkgit:git-pull[1]. + Hooks -----