From: Michael J Gruber <git@drmicha.warpmail.net>
To: "Randal L. Schwartz" <merlyn@stonehenge.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Could this be done simpler?
Date: Thu, 25 Jun 2009 19:19:03 +0200 [thread overview]
Message-ID: <4A43B187.7080509@drmicha.warpmail.net> (raw)
In-Reply-To: <863a9oz8lh.fsf@blue.stonehenge.com>
Randal L. Schwartz venit, vidit, dixit 25.06.2009 16:33:
>>>>>> "Junio" == Junio C Hamano <gitster@pobox.com> writes:
>
> Junio> (5) Continue pretending to be Linus, complete the octopus. The key is to
> Junio> let the "fetch" phase of this to append to the FETCH_HEAD, not
> Junio> replacing it.
>
> Junio> $ git pull --append \
> Junio> git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current \
> Junio> for-linus
>
> The relatively current doc of "--append" looks like this:
>
> -a, --append
> Append ref names and object names of fetched refs to the existing
> contents of will be overwritten.
>
> I read this three times, and still don't know what it means (and it doesn't
> even scan well as English), so I would have never known to use this strategy.
> Can you explain this more in detail, or point at something in the mailing list
> that does?
Uhm,
my version of git-fetch.1 has
-a, --append
Append ref names and object names of fetched refs to the
existing contents of .git/FETCH_HEAD. Without this option
old data in .git/FETCH_HEAD will be overwritten.
That at least scans better in English. It does not make it very clear
what the consequences are, though.
Michael
next prev parent reply other threads:[~2009-06-25 17:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-24 21:35 Could this be done simpler? Linus Torvalds
2009-06-25 1:04 ` Junio C Hamano
2009-06-25 14:33 ` Randal L. Schwartz
2009-06-25 16:32 ` Matthias Andree
2009-06-25 17:25 ` Junio C Hamano
2009-06-25 21:54 ` Matthias Andree
2009-06-27 0:26 ` Junio C Hamano
2009-06-25 18:32 ` Junio C Hamano
2009-06-25 17:19 ` Michael J Gruber [this message]
2009-06-25 22:02 ` Christian Couder
2009-06-25 22:23 ` Christian Couder
2009-06-25 22:29 ` Junio C Hamano
2009-06-25 22:50 ` Linus Torvalds
2009-06-25 23:17 ` Junio C Hamano
2009-06-25 22:55 ` Christian Couder
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=4A43B187.7080509@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=merlyn@stonehenge.com \
--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).