From: Elijah Newren <newren@gmail.com>
To: Shourya Shukla <shouryashukla.oo@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH v6 4/4] gitfaq: fetching and pulling a repository
Date: Wed, 6 May 2020 09:20:02 -0700 [thread overview]
Message-ID: <CABPp-BHurMUPM=NVr7N4Fvx9UccNqi-nQrFH0_vM9a96MjFzog@mail.gmail.com> (raw)
In-Reply-To: <20200506080023.12521-4-shouryashukla.oo@gmail.com>
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'.
> Hooks
> -----
>
> --
> 2.26.2
Other than the two small spacing issues, the series looks good to me.
next prev parent reply other threads:[~2020-05-06 16:20 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 ` [PATCH v6 4/4] gitfaq: fetching and pulling " Shourya Shukla
2020-05-06 16:20 ` Elijah Newren [this message]
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='CABPp-BHurMUPM=NVr7N4Fvx9UccNqi-nQrFH0_vM9a96MjFzog@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
--cc=shouryashukla.oo@gmail.com \
/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).