From: Junio C Hamano <gitster@pobox•com>
To: Thomas Ackermann <th.acker@arcor•de>
Cc: git@vger•kernel.org, wking@tremily•us
Subject: Re: [PATCH 04/13] Use "git merge" instead of "git pull ."
Date: Sat, 24 Aug 2013 20:17:40 -0700 [thread overview]
Message-ID: <xmqqvc2umpbf.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <694030462.1090937.1377329263413.JavaMail.ngmail@webmail08.arcor-online.net> (Thomas Ackermann's message of "Sat, 24 Aug 2013 09:27:43 +0200 (CEST)")
Thomas Ackermann <th.acker@arcor•de> writes:
> "git pull ." works, but "git merge" is the recommended
> way for new users to do things. (The old description
> also should have read "The former is actually *not* very
> commonly used".)
I think it is probably a good idea to replace "pull ." in the two
later hunks with "merge", but the flow of the explanation reads
better if you did not touch the first hunk at all. The section
introduced how fully-spelled "git pull origin master" works, how its
parameters can be omitted in a common case of integrating with the
branch at a remote repository you usually integrate with, and then
the hunk that you touched transitions to the local use, hinting that
your local repository is not all that special. It is very commonly
used among people who grok that fact, and of course it still works
because we do want to support that usage ;-).
On the other hand, these later two hunks are not about explaining
"pull"; using "git merge" in the examples is more appropriate.
> Signed-off-by: Thomas Ackermann <th.acker@arcor•de>
> ---
> Documentation/user-manual.txt | 15 ++-------------
> 1 file changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
> index b450980..8a1a441 100644
> --- a/Documentation/user-manual.txt
> +++ b/Documentation/user-manual.txt
> @@ -1784,17 +1784,6 @@ repository that you pulled from.
> <<fast-forwards,fast-forward>>; instead, your branch will just be
> updated to point to the latest commit from the upstream branch.)
>
> -The `git pull` command can also be given `.` as the "remote" repository,
> -in which case it just merges in a branch from the current repository; so
> -the commands
> -
> --------------------------------------------------
> -$ git pull . branch
> -$ git merge branch
> --------------------------------------------------
> -
> -are roughly equivalent. The former is actually very commonly used.
> -
> [[submitting-patches]]
> Submitting patches to a project
> -------------------------------
> @@ -2259,7 +2248,7 @@ When you are happy with the state of this change, you can pull it into the
> "test" branch in preparation to make it public:
>
> -------------------------------------------------
> -$ git checkout test && git pull . speed-up-spinlocks
> +$ git checkout test && git merge speed-up-spinlocks
> -------------------------------------------------
>
> It is unlikely that you would have any conflicts here ... but you might if you
> @@ -2271,7 +2260,7 @@ see the value of keeping each patch (or patch series) in its own branch. It
> means that the patches can be moved into the `release` tree in any order.
>
> -------------------------------------------------
> -$ git checkout release && git pull . speed-up-spinlocks
> +$ git checkout release && git merge speed-up-spinlocks
> -------------------------------------------------
>
> After a while, you will have a number of branches, and despite the
next prev parent reply other threads:[~2013-08-25 3:18 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-24 7:22 [PATCH 0/13] Modernize user-manual Thomas Ackermann
2013-08-24 7:24 ` [PATCH 01/13] Call it "Git User Manual" and remove reference to very old Git version Thomas Ackermann
2013-08-25 3:05 ` Jonathan Nieder
2013-08-25 3:07 ` Junio C Hamano
2013-08-24 7:25 ` [PATCH 02/13] Use current "detached HEAD" message Thomas Ackermann
2013-08-25 3:49 ` Jonathan Nieder
2013-08-25 8:10 ` Aw: " Thomas Ackermann
2013-08-24 7:26 ` [PATCH 03/13] Use current output for "git repack" Thomas Ackermann
2013-08-25 4:15 ` Jonathan Nieder
2013-08-25 8:37 ` Aw: " Thomas Ackermann
2013-08-24 7:27 ` [PATCH 04/13] Use "git merge" instead of "git pull ." Thomas Ackermann
2013-08-25 3:17 ` Junio C Hamano [this message]
2013-08-25 4:19 ` Jonathan Nieder
2013-08-25 5:26 ` Martin von Zweigbergk
2013-08-24 7:28 ` [PATCH 05/13] Fix some typos Thomas Ackermann
2013-08-25 5:01 ` Jonathan Nieder
2013-08-25 9:13 ` Aw: " Thomas Ackermann
2013-08-24 7:29 ` [PATCH 06/13] Simplify "How to make a commit" Thomas Ackermann
2013-08-25 3:20 ` Junio C Hamano
2013-08-25 5:05 ` Jonathan Nieder
2013-08-25 9:20 ` Aw: " Thomas Ackermann
2013-08-24 7:30 ` [PATCH 07/13] Improve description in "How to merge" Thomas Ackermann
2013-08-25 3:22 ` Junio C Hamano
2013-08-25 5:08 ` Jonathan Nieder
2013-08-25 11:31 ` Aw: " Thomas Ackermann
2013-08-24 7:31 ` [PATCH 08/13] Improve section "Manipulating branches" Thomas Ackermann
2013-08-25 3:25 ` Junio C Hamano
2013-08-25 11:41 ` Aw: " Thomas Ackermann
2013-08-24 7:32 ` [PATCH 09/13] Improve section "Merge multiple trees" Thomas Ackermann
2013-08-25 5:23 ` Jonathan Nieder
2013-08-25 12:06 ` Aw: " Thomas Ackermann
2013-08-25 20:10 ` Jonathan Nieder
2013-08-24 7:33 ` [PATCH 10/13] Remove unnecessary historical note from "Object storage format" Thomas Ackermann
2013-08-25 3:28 ` Junio C Hamano
2013-08-24 7:34 ` [PATCH 11/13] Remove obscure reference from "Examples" Thomas Ackermann
2013-08-25 3:53 ` Junio C Hamano
2013-08-25 5:25 ` Jonathan Nieder
2013-08-25 9:30 ` Aw: " Thomas Ackermann
2013-08-24 7:35 ` [PATCH 12/13] Remove irrelevant reference from "Tying it all together" Thomas Ackermann
2013-08-25 3:56 ` Junio C Hamano
2013-08-26 13:51 ` Jon Loeliger
2013-08-24 7:37 ` [PATCH 13/13] "git prune" is safe now Thomas Ackermann
2013-08-25 3:59 ` Junio C Hamano
2013-08-24 19:31 ` [PATCH 0/13] Modernize user-manual Philip Oakley
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvc2umpbf.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=th.acker@arcor$(echo .)de \
--cc=wking@tremily$(echo .)us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox