From: Jeff King <peff@peff.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Emily Shaffer <emilyshaffer@google.com>,
Jonathan Tan <jonathantanmy@google.com>,
git@vger.kernel.org
Subject: Re: Git in Outreachy December 2019?
Date: Tue, 24 Sep 2019 11:33:17 -0400 [thread overview]
Message-ID: <20190924153316.GA1801@sigill.intra.peff.net> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1909241624300.15067@tvgsbejvaqbjf.bet>
On Tue, Sep 24, 2019 at 04:25:45PM +0200, Johannes Schindelin wrote:
> > I think it could make sense for merge-index to be able to directly run
> > the merge-one-file code[1]. But I think we'd want to keep its ability to
> > run an arbitrary script, and for people to call merge-one-file
> > separately, since right now you can do:
> >
> > git merge-index my-script
> >
> > and have "my-script" do some processing of its own, then hand off more
> > work to merge-one-file.
>
> Oh, sorry, I did not mean to say that we should do away with this at
> all! Rather, I meant to say that `merge-index` could detect when it was
> asked to run `git-merge-one-file` and re-route to internal code instead
> of spawning a process. If any other script/program was specified, it
> should be spawned off, just like it is done today.
OK, great, then we are completely on the same page. :)
-Peff
next prev parent reply other threads:[~2019-09-24 15:33 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 5:17 Git in Outreachy December 2019? Jeff King
2019-08-31 7:58 ` Christian Couder
2019-08-31 19:44 ` Olga Telezhnaya
2019-09-04 19:41 ` Jeff King
2019-09-05 7:24 ` Christian Couder
2019-09-05 19:39 ` Emily Shaffer
2019-09-06 11:55 ` Carlo Arenas
2019-09-07 6:39 ` Jeff King
2019-09-07 10:13 ` Carlo Arenas
2019-09-07 6:36 ` Jeff King
2019-09-08 14:56 ` Pratyush Yadav
2019-09-09 17:00 ` Jeff King
2019-09-23 18:07 ` SZEDER Gábor
2019-09-26 9:47 ` SZEDER Gábor
2019-09-26 19:32 ` Johannes Schindelin
2019-09-26 21:54 ` SZEDER Gábor
2019-09-26 11:42 ` Johannes Schindelin
2019-09-13 20:03 ` Jonathan Tan
2019-09-13 20:51 ` Jeff King
2019-09-16 18:42 ` Emily Shaffer
2019-09-16 21:33 ` Eric Wong
2019-09-16 21:44 ` SZEDER Gábor
2019-09-16 23:13 ` Jonathan Nieder
2019-09-17 0:59 ` Jeff King
2019-09-17 11:23 ` Johannes Schindelin
2019-09-17 12:02 ` SZEDER Gábor
2019-09-23 12:47 ` Johannes Schindelin
2019-09-23 16:58 ` SZEDER Gábor
2019-09-26 11:04 ` Johannes Schindelin
2019-09-26 13:28 ` SZEDER Gábor
2019-09-26 19:39 ` Johannes Schindelin
2019-09-26 21:44 ` SZEDER Gábor
2019-09-27 22:18 ` Jeff King
2019-10-09 17:25 ` SZEDER Gábor
2019-10-11 6:34 ` Jeff King
2019-09-23 18:19 ` Jeff King
2019-09-24 14:30 ` Johannes Schindelin
2019-09-17 15:10 ` Christian Couder
2019-09-23 12:50 ` Johannes Schindelin
2019-09-23 19:30 ` Jeff King
2019-09-23 18:07 ` Jeff King
2019-09-24 14:25 ` Johannes Schindelin
2019-09-24 15:33 ` Jeff King [this message]
2019-09-28 3:56 ` Junio C Hamano
2019-09-24 0:55 ` Eric Wong
2019-09-26 12:45 ` Johannes Schindelin
2019-09-30 8:55 ` Eric Wong
2019-09-28 4:01 ` Junio C Hamano
2019-09-20 17:04 ` Jonathan Tan
2019-09-21 1:47 ` Emily Shaffer
2019-09-23 14:23 ` Christian Couder
2019-09-23 19:40 ` Jeff King
2019-09-23 22:29 ` Philip Oakley
2019-10-22 21:16 ` Emily Shaffer
2019-09-23 11:49 ` Christian Couder
2019-09-23 17:58 ` Jonathan Tan
2019-09-23 19:27 ` Jeff King
2019-09-23 20:48 ` Jonathan Tan
2019-09-23 19:15 ` Jeff King
2019-09-23 20:38 ` Jonathan Tan
2019-09-23 21:28 ` Jeff King
2019-09-24 17:07 ` Jonathan Tan
2019-09-26 7:09 ` Jeff King
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=20190924153316.GA1801@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.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).