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.