From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Thomas Ackermann <th.acker@arcor.de>,
git@vger.kernel.org, martinvonz@gmail.com, wking@tremily.us,
philipoakley@iee.org
Subject: Re: [PATCH 04/11] Use "git merge" instead of "git pull ."
Date: Tue, 27 Aug 2013 12:44:22 -0700 [thread overview]
Message-ID: <20130827194422.GW4110@google.com> (raw)
In-Reply-To: <xmqqob8jc5s6.fsf@gitster.dls.corp.google.com>
On Tue, Aug 27, 2013 at 12:06:33PM -0700, Junio C Hamano wrote:
> 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".)
>
> It does not matter that you are unaware other people use it often.
> I'd suggest dropping the first hunk altogether.
Eh, the claim "The former is actually very commonly used." is
confusing on its own (even though it used to be true) and elaborating
wouldn't help much with education, so the first hunk makes sense to
me. But maybe it should have been done in a separate patch. ;-)
Thanks,
Jonathan
next prev parent reply other threads:[~2013-08-27 19:44 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 17:52 [PATCH v2 0/11] Modernize user-manual Thomas Ackermann
2013-08-27 17:55 ` [PATCH 01/11] Call it "Git User Manual" and remove reference to very old Git version Thomas Ackermann
2013-08-27 19:04 ` Junio C Hamano
2013-08-27 21:16 ` Lars Gullik Bjønnes
2013-08-29 18:12 ` Junio C Hamano
2013-08-27 17:56 ` [PATCH 02/11] Use current "detached HEAD" message Thomas Ackermann
2013-08-29 18:13 ` Junio C Hamano
2013-08-27 17:56 ` [PATCH 03/11] Use current output for "git repack" Thomas Ackermann
2013-08-29 18:13 ` Junio C Hamano
2013-08-27 17:58 ` [PATCH 04/11] Use "git merge" instead of "git pull ." Thomas Ackermann
2013-08-27 19:06 ` Junio C Hamano
2013-08-27 19:44 ` Jonathan Nieder [this message]
2013-08-27 20:46 ` Junio C Hamano
2013-08-27 17:59 ` [PATCH 05/11] Fix some typos and improve wording Thomas Ackermann
2013-08-27 19:07 ` Junio C Hamano
2013-08-29 18:16 ` Junio C Hamano
2013-08-27 18:01 ` [PATCH 06/11] Simplify "How to make a commit" Thomas Ackermann
2013-08-27 19:08 ` Junio C Hamano
2013-08-29 18:16 ` Junio C Hamano
2013-08-27 18:02 ` [PATCH 07/11] Improve section "Manipulating branches" Thomas Ackermann
2013-08-27 19:11 ` Junio C Hamano
2013-08-27 18:03 ` [PATCH 08/11] Improve section "Merging multiple trees" Thomas Ackermann
2013-08-27 19:15 ` Junio C Hamano
2013-08-27 18:04 ` [PATCH 09/11] Remove unnecessary historical note from "Object storage format" Thomas Ackermann
2013-08-27 19:16 ` Junio C Hamano
2013-08-27 18:04 ` [PATCH 10/11] Remove irrelevant reference from "Tying it all together" Thomas Ackermann
2013-08-27 18:05 ` [PATCH 11/11] "git prune" is safe Thomas Ackermann
2013-08-27 19:17 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130827194422.GW4110@google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martinvonz@gmail.com \
--cc=philipoakley@iee.org \
--cc=th.acker@arcor.de \
--cc=wking@tremily.us \
/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.
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 NNTP newsgroup(s).