git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v6 4/4] gitfaq: fetching and pulling a repository

From
Junio C Hamano <gitster@pobox.com>
Date
May 6, 2020, 17:19 UTC
Message-ID
<xmqqh7wt6kwy.fsf@gitster.c.googlers.com>
In-Reply-To
<CABPp-BHurMUPM=NVr7N4Fvx9UccNqi-nQrFH0_vM9a96MjFzog@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 31 quoted lines
> Hi Shourya,
>
> On Wed, May 6, 2020 at 1:00 AM Shourya Shukla
> <shouryashukla.oo@gmail.com> wrote:
>>
>> 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].
>
> Looks like you have a tab instead of a space between 'immediately' and 'by'.

Good eyes. Otherwise the contents of this new paragraph looks OK to me.

There is no "git partial-clone" command, so the reference at the end of the previous paragraph looks bogus, but that is not a fault of this step.

Thanks.
Previous: Elijah NewrenNext: Shourya Shukla
Message 6 of 8 in “gitfaq: files in .gitignore are tracked”
  1. 1/4 gitfaq: files in .gitignore are trackedShourya Shukla, May 6, 2020
  2. 2/4 gitfaq: changing the remote of a repositoryShourya Shukla, May 6, 2020
  3. Junio C HamanoMay 6, 2020
  4. 4/4 gitfaq: fetching and pulling a repositoryShourya Shukla, May 6, 2020
  5. Elijah NewrenMay 6, 2020
  6. Junio C HamanoMay 6, 2020
  7. 3/4 gitfaq: partial cloning a repositoryShourya Shukla, May 6, 2020
  8. Elijah NewrenMay 6, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.