git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Shourya Shukla <shouryashukla.oo@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, newren@gmail.com,
	sandals@crustytoothpaste.net,
	Shourya Shukla <shouryashukla.oo@gmail.com>
Subject: [PATCH v6 4/4] gitfaq: fetching and pulling a repository
Date: Wed,  6 May 2020 13:30:23 +0530	[thread overview]
Message-ID: <20200506080023.12521-4-shouryashukla.oo@gmail.com> (raw)
In-Reply-To: <20200506080023.12521-1-shouryashukla.oo@gmail.com>

Add an issue in 'Common Issues' section which addresses the confusion
between performing a 'fetch' and a 'pull'.

Helped-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
---
 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
 -----
 
-- 
2.26.2


  parent reply	other threads:[~2020-05-06  8:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-06  8:00 [PATCH v6 1/4] gitfaq: files in .gitignore are tracked Shourya Shukla
2020-05-06  8:00 ` [PATCH v6 2/4] gitfaq: changing the remote of a repository Shourya Shukla
2020-05-06 17:17   ` Junio C Hamano
2020-05-06  8:00 ` [PATCH v6 3/4] gitfaq: partial cloning " Shourya Shukla
2020-05-06 16:16   ` Elijah Newren
2020-05-06  8:00 ` Shourya Shukla [this message]
2020-05-06 16:20   ` [PATCH v6 4/4] gitfaq: fetching and pulling " Elijah Newren
2020-05-06 17:19     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200506080023.12521-4-shouryashukla.oo@gmail.com \
    --to=shouryashukla.oo@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    --cc=sandals@crustytoothpaste.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).