From: Eric Sunshine <sunshine@sunshineco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>, John Keeping <john@keeping.me.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andreas Krey <a.krey@gmx.de>,
John Szakmeister <john@szakmeister.net>,
Andreas Schwab <schwab@linux-m68k.org>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull
Date: Fri, 19 Jul 2013 16:29:20 -0400 [thread overview]
Message-ID: <CAPig+cQEtKc+tfDgqVWYL2JtxXc=wvS=P7_O=XJzizz1BN=n4A@mail.gmail.com> (raw)
In-Reply-To: <7vy592wmcs.fsf@alter.siamese.dyndns.org>
On Fri, Jul 19, 2013 at 12:22 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Eric Sunshine <sunshine@sunshineco.com> writes:
>
>>> +When `git pull` that does not explicitly specify what branch from
>>> +which repository is to be integrated with your history on the
>>> +command line, recent Git will refuse to work until you specify how
>>> +that integration should happen, either with a command line option
>>> +(`--merge` or `--rebase`) or a configuration variable (`pull.rebase`
>>> +or `branch.<name>.rebase`, which is the same as `--merge`
>>> +(`--rebase`) when set to `false` (`true`) respectively.
>>
>> This paragraph-long single sentence may be intimidating. Perhaps some
>> simplification is possible:
>>
>> As a safety measure, bare `git pull` (without repository or
>> branch) needs to be told how to integrate pulled changes with
>> your history; either via `--merge` or `--rebase`. Also see
>> configuration variables `pull.rebase` and `branch.<name>.rebase`
>> in linkgit:git-config[1].
>>
>> I intentionally omitted the true/false explanation of the
>> configuration variables since the user can follow the link and read
>> about them. It also may make sense to drop mention of those variables
>> altogether since they are already described (including link) in the
>> description of --rebase.
>>
>> I also intentionally omitted "recent Git" since it's rather nebulous.
>
> Looks much better than the original. I would further suggest
> dropping the "As a safety measure, bare " at the beginning.
>
> `git pull` (without repository or branch on the command line)
> needs to be told how to integrate the changes with your
> history via either `--merge` or `--rebase` (see configuration
> variables `pull.rebase` and `branch.<name>.rebase` in
> linkgit:git-config[1]).
>
> perhaps?
That works; or without the mentioning the configuration variables at
all (assuming the reader will discover them from reading --rebase
description):
`git pull` (without repository or branch on the command line)
needs to be told how to integrate the changes with your history
via either `--merge` or `--rebase`.
Dropping the parenthetical comment might improve flow slightly:
Without repository or branch on the command line, `git pull`
needs to be told how to integrate the changes with your history,
via either `--merge` or `--rebase`.
With or without mention of the configuration options, either phrasing
seems pretty easy to digest.
next prev parent reply other threads:[~2013-07-19 20:29 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-22 11:50 first parent, commit graph layout, and pull merge direction Andreas Krey
2013-05-22 18:07 ` Junio C Hamano
2013-05-23 9:06 ` Andreas Krey
2013-05-23 9:48 ` John Szakmeister
2013-05-23 10:07 ` Jeremy Rosen
2013-05-23 10:29 ` Andreas Krey
2013-05-23 11:08 ` John Keeping
2013-05-23 16:01 ` Junio C Hamano
2013-05-23 16:41 ` John Keeping
2013-05-23 21:01 ` Junio C Hamano
2013-05-23 21:55 ` John Keeping
2013-05-23 21:59 ` Felipe Contreras
2013-05-23 22:11 ` Junio C Hamano
2013-05-23 22:46 ` Felipe Contreras
2013-05-23 22:54 ` Junio C Hamano
2013-05-23 23:09 ` Felipe Contreras
2013-05-23 23:26 ` Junio C Hamano
2013-05-23 23:53 ` Felipe Contreras
2013-05-24 8:29 ` John Keeping
2013-05-24 9:38 ` John Szakmeister
2013-05-24 0:03 ` Linus Torvalds
2013-05-24 0:21 ` Junio C Hamano
2013-05-24 0:24 ` Linus Torvalds
2013-05-24 0:25 ` Felipe Contreras
2013-05-24 0:32 ` Felipe Contreras
2013-05-24 16:26 ` Junio C Hamano
2013-05-24 20:47 ` Philip Oakley
2013-06-27 19:48 ` [PATCH] pull: require choice between rebase/merge on non-fast-forward pull Junio C Hamano
2013-06-27 20:10 ` W. Trevor King
2013-06-27 21:20 ` Junio C Hamano
2013-06-28 1:08 ` W. Trevor King
2013-06-28 6:34 ` Matthieu Moy
2013-06-28 9:09 ` W. Trevor King
2013-06-28 11:52 ` Matthieu Moy
2013-06-28 12:28 ` W. Trevor King
2013-06-27 20:11 ` Fredrik Gustafsson
2013-06-27 20:49 ` Junio C Hamano
2013-06-27 20:30 ` W. Trevor King
2013-06-27 20:58 ` Junio C Hamano
2013-06-27 22:16 ` Matthieu Moy
2013-06-28 1:19 ` W. Trevor King
2013-06-28 8:09 ` John Keeping
2013-06-28 17:22 ` Junio C Hamano
2013-06-28 17:42 ` John Keeping
2013-06-28 22:41 ` Junio C Hamano
2013-07-02 21:18 ` John Keeping
2013-07-14 15:03 ` [PATCH] fixup! " John Keeping
2013-07-15 4:23 ` Junio C Hamano
2013-08-28 23:22 ` [PATCH] " Felipe Contreras
2013-07-18 14:30 ` John Keeping
2013-07-18 17:38 ` Andreas Schwab
2013-07-18 18:00 ` Junio C Hamano
2013-07-18 19:35 ` [PATCH v2] " Junio C Hamano
2013-07-19 0:54 ` Eric Sunshine
2013-07-19 16:22 ` Junio C Hamano
2013-07-19 20:29 ` Eric Sunshine [this message]
2013-07-19 22:20 ` Junio C Hamano
2013-07-19 22:30 ` Eric Sunshine
2013-07-19 22:55 ` Junio C Hamano
2014-01-22 19:08 ` Flimm
2013-05-24 17:11 ` first parent, commit graph layout, and pull merge direction Andreas Krey
2013-05-24 19:23 ` Junio C Hamano
2013-05-23 19:25 ` Andreas Krey
2013-05-24 9:29 ` Holger Hellmuth (IKS)
2013-05-24 13:42 ` Andreas Krey
2013-05-24 15:05 ` Holger Hellmuth (IKS)
2013-05-24 17:24 ` Andreas Krey
2013-05-23 11:34 ` Felipe Contreras
2013-05-23 12:21 ` Andreas Krey
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='CAPig+cQEtKc+tfDgqVWYL2JtxXc=wvS=P7_O=XJzizz1BN=n4A@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=john@szakmeister.net \
--cc=schwab@linux-m68k.org \
--cc=torvalds@linux-foundation.org \
/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).