From patchwork Wed May 6 08:00:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shourya Shukla X-Patchwork-Id: 11530575 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 CF1031392 for ; Wed, 6 May 2020 08:02:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABB5C206DD for ; Wed, 6 May 2020 08:02:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fIp5MLvR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728344AbgEFIAo (ORCPT ); Wed, 6 May 2020 04:00:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728290AbgEFIAo (ORCPT ); Wed, 6 May 2020 04:00:44 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0298EC061A0F for ; Wed, 6 May 2020 01:00:43 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id x77so614162pfc.0 for ; Wed, 06 May 2020 01:00:43 -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=fIp5MLvRJc1Cn6m9FMEyWoGyLlV5oMqrtYRq+00vW9FdjCLx5OAGkTFSX44v5PfTN5 BJxdAihNppkmz6KFpKwsnn/fWHrwsw65OJRrqdc8Rormq3rXjmennpnAT40ukTrIBI18 6n3frSlZKkgcfssWUu32cGXLH4AQj55Tuo8MIQ7dH0NU9cRXjJqm2oeogg8RU6AWSi05 p2ARY3yCtJw5VjC5na/u5FvZr9lS/Sqw9xoiar4vpe0ai8S0fUhTrBZzVrXnssGOJfT/ H3EfQu3kRnzlv9whlffZCR8jZyfxMjLpEjlrrUzg46tMI6MjMRvrF6yvO/30gII1ADuy w1HQ== 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=pvO4dLTFHh8dmXNLI3FVb9n3wvaoIIqYhT0JcWysjLce2jA7AWneTU1ojSDngCYSxp Nxh3v+ScaJV0jxHEv3NTi3q2rsNh0UTvkMHZz55Gvz63knRbGok0X7SUxDExLYbfFGrw 9N3VG/Yn3fHhFn/v0RPHfkK+hHvbEfoTMJoWa/8zGngoYY3Z3SBuCBmbdGEicmlFV9md aZu5GsaQfqPhW5xlYZNhaXr9hH5kyKLPyRvdn0NtcNrquk0gsPUXbJbd/TV3u/e8jo+4 Tm21vecl3v3r8RYUpefLkoAbNejxJiyDDcEjCc3DIaUUVeSXVOGCavmuHD4wl+WXqMpX xMMA== X-Gm-Message-State: AGi0PuaYlrt8fXbiBzKT/ZcwmkuBkOmeYmJ7AZC7Q1Pb0Z6sVBw2GS5j uNvoP8q72IN0WtB98uVU2KPgu0SpRr3L+Q== X-Google-Smtp-Source: APiQypLm4BTEU3dZK949a0vtm2AW12LoYVJaFZgopIdboa0tb7L9SPjg9x+JkY5PcUyerBj4ZwyYqA== X-Received: by 2002:a05:6a00:a:: with SMTP id h10mr6932817pfk.160.1588752042809; Wed, 06 May 2020 01:00:42 -0700 (PDT) Received: from konoha.iitr.ac.in ([103.37.201.177]) by smtp.gmail.com with ESMTPSA id s44sm4312629pjc.28.2020.05.06.01.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 01:00:41 -0700 (PDT) From: Shourya Shukla To: git@vger.kernel.org Cc: gitster@pobox.com, newren@gmail.com, sandals@crustytoothpaste.net, Shourya Shukla Subject: [PATCH v6 1/4] gitfaq: files in .gitignore are tracked Date: Wed, 6 May 2020 13:30:20 +0530 Message-Id: <20200506080023.12521-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 08:00:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shourya Shukla X-Patchwork-Id: 11530577 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 EB13B17EF for ; Wed, 6 May 2020 08:02:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D3BD7206DD for ; Wed, 6 May 2020 08:02:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WA70+mAi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728366AbgEFIAs (ORCPT ); Wed, 6 May 2020 04:00:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728290AbgEFIAs (ORCPT ); Wed, 6 May 2020 04:00:48 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCE42C061A0F for ; Wed, 6 May 2020 01:00:46 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id hi11so476523pjb.3 for ; Wed, 06 May 2020 01:00:46 -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=WA70+mAiAorI72C9P3Afv3lGl6Y+YpyAA3wAHD5RSWAfHjMb7UUEriKu2kXn0PEY8V I6yXQj9DzlhPd38nU/c7PxtzhJiVE9ubxYc+lZwfe+yrmFHfzr3dOqPc3RCobk/cmQ38 mhkz/VqqEEI+GfjoLHQDM8R0rMjg2/56n63Syd+ZOVe8T4DoliU+9Q5vKfBSf4FKuOc1 ZHr93z9MFJQzjPACS3NR+kj3Wc67LB9tkcO4tlrWyUM3Gn2apQ67z3rtwRauA2zid3TS Z3EKHWNoa5T3BFZtVZFtAel6Upar/gRMiM59HRwwsoWuqZVh7QmW/69baU3t/PUwBi9C CA0Q== 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=o6Bb4f/nQjBu9x3ehw91Pt1HC4EKVXR2qizOJkx6qxTxzKN4vC9VOuHWgsTvRP2gFp o5+2RiTkNS0RMKuDQzb7z6vgH501ylrZG8KgL+GTwvpZLdPUaKp3tjrHtMYCZXpC+n3x nCeRWZc900uBP0lx9AUxn4+S6y3SSPYM9Mo8pmB+OwDG74+P6Cg4v3aXjGaCnVvM4ynb dQXemP9kOHXcY49n9ymuHSqq/utL/NPeOuEJcQHxuSHKYjKEq51Fqa4yaEgsXdHoNWoM jQt2zWf8Io4G3kbZmwBnEVa/1chuiKjtMtSI2VTqGTRLfmoRW5/6CMLbt0ZHlhPuFFgi n7xA== X-Gm-Message-State: AGi0PuYa/mIW/k4viGnBFMwyFtvMZF1Ts/FV6enyGkYFzNnZVnr1b+g6 NMI58IhkLEWNbkF2BJW2V8UbBMvqAKKi5A== X-Google-Smtp-Source: APiQypJeSpmDtPHhP9XgGdCoTI3XuTlwOxxOu8LWskphP81Mx/XaajSmS3TyPZ2ExLzEcCw0aIXHXQ== X-Received: by 2002:a17:90a:1b0c:: with SMTP id q12mr7263730pjq.116.1588752045807; Wed, 06 May 2020 01:00:45 -0700 (PDT) Received: from konoha.iitr.ac.in ([103.37.201.177]) by smtp.gmail.com with ESMTPSA id s44sm4312629pjc.28.2020.05.06.01.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 01:00:45 -0700 (PDT) From: Shourya Shukla To: git@vger.kernel.org Cc: gitster@pobox.com, newren@gmail.com, sandals@crustytoothpaste.net, Shourya Shukla Subject: [PATCH v6 2/4] gitfaq: changing the remote of a repository Date: Wed, 6 May 2020 13:30:21 +0530 Message-Id: <20200506080023.12521-2-shouryashukla.oo@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200506080023.12521-1-shouryashukla.oo@gmail.com> References: <20200506080023.12521-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 08:00:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shourya Shukla X-Patchwork-Id: 11530579 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 132721862 for ; Wed, 6 May 2020 08:02:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EFFA5206DD for ; Wed, 6 May 2020 08:02:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AymxsJoR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728371AbgEFIAu (ORCPT ); Wed, 6 May 2020 04:00:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728290AbgEFIAt (ORCPT ); Wed, 6 May 2020 04:00:49 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC47CC061A0F for ; Wed, 6 May 2020 01:00:49 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id v63so589265pfb.10 for ; Wed, 06 May 2020 01:00:49 -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=jt0SOv54Q8fzlLAplV2Dzowsj5UsGTs46677UrXlCYY=; b=AymxsJoRiGZcMy0obk/KVl+t4/lD68Gwi3SDOM8LZS6vG3gnYVPtpzpl9WM0N1wjnO Ys9OFw0qgpvScwOBCujS6N2f+Ylq9yPUr1Oec28UvzFJLctI1ERfoStfVrM8lIb/JFak wdQlaF9kFUJ83HrKwG93ffdRYusqGw6V1e4VvvEERTQ/E+clzAQdVZh5k8ANMFOEpRhA cp3/DaKF9p3y9VH7p9SbL+YI1UVjf9hW0hupUerZG9+HD9PeBsePcFmhCtiO6Xv9im7N Sch9UmziQsUa6JFt3mWVjvp9d5g+aAPl5piq9HS8s0B6F9DZgHXBmFwMr2QQ2JsG3m2V 7PEA== 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=jt0SOv54Q8fzlLAplV2Dzowsj5UsGTs46677UrXlCYY=; b=h8q9CWd9WtY47SgVxu7HfQq9qMvkfcxpxEcOUB1CQir95FnmQk87rBAyQEmS7VWN8q YKaQSHqNNthHAu73RyfswNj8l/sJ5b/+9eYN5RCtW5zi2XH/EbxKkoOx5Vjd7OBfk1H9 WAQ3IygsSGo6Os7les1lLvEel6xD9ULwP/ruik44FSDzS7pmbO/WjkuDKEDbVAP3eDBY YPmUyh5xbQGaSuoWP3UfnPGZWRE1BC1QJpjyQtrFWm8ubkMKc9KfPIj21Ym67irZp2zo 0I6JS+r/vvFl9zzv7/fvYD8lD0+d4CTfT1v/mBLw144L4UHVkSqJHavwBh98w2cpMgy5 M0Cw== X-Gm-Message-State: AGi0PuYSdg1wrTX0MiZoxevacKqlP2wHjaOoY7Wy9D7kP5QBg97738m2 /bdV+Ar5m/U9qaZv39n4LA0Fvcdz52ZljA== X-Google-Smtp-Source: APiQypJj4IE6vAh5t9007jLW27AkjmEY75Gn47WlXMTt/ZtQSQEHkd07f3eYa0ncvO/A7mdN2kcQPQ== X-Received: by 2002:aa7:9d90:: with SMTP id f16mr7220317pfq.48.1588752048778; Wed, 06 May 2020 01:00:48 -0700 (PDT) Received: from konoha.iitr.ac.in ([103.37.201.177]) by smtp.gmail.com with ESMTPSA id s44sm4312629pjc.28.2020.05.06.01.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 01:00:48 -0700 (PDT) From: Shourya Shukla To: git@vger.kernel.org Cc: gitster@pobox.com, newren@gmail.com, sandals@crustytoothpaste.net, Shourya Shukla Subject: [PATCH v6 3/4] gitfaq: partial cloning a repository Date: Wed, 6 May 2020 13:30:22 +0530 Message-Id: <20200506080023.12521-3-shouryashukla.oo@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200506080023.12521-1-shouryashukla.oo@gmail.com> References: <20200506080023.12521-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 --- Documentation/gitfaq.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index 875cfa0acd..5dfbb32089 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 08:00:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shourya Shukla X-Patchwork-Id: 11530581 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 3001814C0 for ; Wed, 6 May 2020 08:02:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1837420747 for ; Wed, 6 May 2020 08:02:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LTL2a2rU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728399AbgEFIAx (ORCPT ); Wed, 6 May 2020 04:00:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728290AbgEFIAx (ORCPT ); Wed, 6 May 2020 04:00:53 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB852C061A0F for ; Wed, 6 May 2020 01:00:52 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id j21so743976pgb.7 for ; Wed, 06 May 2020 01:00:52 -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=kK7hH57bq6vkJJU9F+fuRltSazWPLKfEajOtDR7f9D4=; b=LTL2a2rUZ0SXlKV8TQMVKovDx9AujAbNWe/a/LHEgW5ZfQHihS4ICr/4EUx6JM7E+f ar9lhwSN8dudv7b92r75HLnCgYJu3rqZ6wdHMYpaG8M4L0RQJ8N4KFL5JvvOWWE5Sk+i gp6tcvcgkDmRvpo07VSewmasonO74ETF81ofeePjpCdawPexudmwXV2QEAmTByq4EQx4 WyWNsYtBFiolGZaa1CrbVrYViGUKqnc2R54qmI/7oiWEaORnIJtqapaMXO3ublsHOzlr VknDnF/gXHX8nmC4L7qm3UkUsY7jehhmWVdvvhpxZBJwwQOHLJDGrnX60Jk62Cm+lef+ 40/Q== 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=kK7hH57bq6vkJJU9F+fuRltSazWPLKfEajOtDR7f9D4=; b=ldGBk7br5VqdJirLXoHxX4/57HM+YxLtlJCb4lmU7I3Rp2bgfUCoBHEj8t7JnAvOEx hjciIkszTTMmeO8R1QozKAFtLoh3KLT6J31Z0D2qG7BrOiFPNwI5LFZ5kJM0hvesiHVr MAo1F/hMhYjjuN7xQsiofuWKRqhzp2ZIImXql0jxuMdCY5f+IH3Oemx2GJ5JZ62AcW80 Ocbeb9XrHXQJM1GNGuDDz8Rkmq94jG+3Ou922r22RU2V+aa5mX4omzPNQcDEYd/eDBOA OyWAP5X6yjlKW1sxcENh8nVSZQehStgaMp+WKadK/KJH0jqJf9uNYKMvy0GkLNWKJAdC F6xg== X-Gm-Message-State: AGi0Puavm/8kYGo/MfsJNVoAyAtObjwPtHmelO+Na4BLvGwYoYQLFfEd 5qeQFzxctjBO8zp6XCgOlcrBO8EU3SHFAw== X-Google-Smtp-Source: APiQypKglBDZyPuqZs49cgPFDindApDAZ4hxxDf3aKFvBYDktvFEVh21QEPKzXC0ZL78OJJUXXRFoA== X-Received: by 2002:a62:8707:: with SMTP id i7mr7241149pfe.133.1588752051779; Wed, 06 May 2020 01:00:51 -0700 (PDT) Received: from konoha.iitr.ac.in ([103.37.201.177]) by smtp.gmail.com with ESMTPSA id s44sm4312629pjc.28.2020.05.06.01.00.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 01:00:51 -0700 (PDT) From: Shourya Shukla To: git@vger.kernel.org Cc: gitster@pobox.com, newren@gmail.com, sandals@crustytoothpaste.net, Shourya Shukla Subject: [PATCH v6 4/4] gitfaq: fetching and pulling a repository Date: Wed, 6 May 2020 13:30:23 +0530 Message-Id: <20200506080023.12521-4-shouryashukla.oo@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200506080023.12521-1-shouryashukla.oo@gmail.com> References: <20200506080023.12521-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 --- Documentation/gitfaq.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index 5dfbb32089..53e3844374 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 -----