git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Git Mailing List" <git@vger.kernel.org>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	"Jeff King" <peff@peff.net>, "Johannes Sixt" <j6t@kdbg.org>,
	"Duy Nguyen" <pclouds@gmail.com>,
	"Jakub Narębski" <jnareb@gmail.com>
Subject: Re: patch submission process, was Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors
Date: Thu, 4 Aug 2016 09:42:18 -0700	[thread overview]
Message-ID: <CAGZ79kaTT3NgKj8akB8t9b1BF3i6sXe7Un9oq5KP8077Wz-E+g@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1608041730130.5786@virtualbox>

On Thu, Aug 4, 2016 at 8:58 AM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
>
>> If we were to change our workflows drastically, I'd propose to
>> go a way[1] similar to notedb in Gerrit, or git-series,
>
> Gerrit is a huge, non-distributed system. Complex, too. If we change the
> patch submission process, we should make things *easier*, not *harder*. So
> I think Gerrit is pretty much out of the question.

I did not propose to use Gerrit or git-series or git appraise.

However whenever I see these projects talking to each other, the talk focuses on
a "unified review storage format" pretty often, which would make them compatible
with each other. So then I could choose git-series, while you could go with
git appraise (although that is written in go, so maybe too fancy already ;)
Or there could be another new program written in C that follows the "review
format".


>
> Even requiring every contributor to register with GitHub would be too much
> of a limitation, I would wager.
>
> And when I said I have zero interest in tools that use the "latest and
> greatest language", I was hinting at git-series. Rust may be a fine and
> wonderful language. Implementing git-series in Rust, however, immediately
> limited the potential engagement with developers dramatically.
>
> Additionally, I would like to point out that defining a way to store
> reviews in Git is not necessarily improving the way our code contribution
> process works. If you want to record the discussions revolving around the
> code, I think public-inbox already does a pretty good job at that.

Yeah recording is great, but we want to talk about replying and modifying
a series? So if I see a patch flying by on the mailing list, ideally I could
attach a "!fixup, signed off by Stefan" thing to that patch. (I said "thing"
as I do not necessarily mean email here.

>
> I guess I have no really good idea yet, either, how to retain the ease of
> access of sending mails to the list, yet somehow keep a strong tie with
> the original data stored in Git.

Does it have to be email? Transmitting text could be solved differently as well.

With git push/fetch we can interact with a git remote and pertain the state
(commits, ancestor graph) at a full level even including notes that comment
on commits.

git send-email/format-patch recently learned to include a base commit
(xy/format-patch-base), maybe we need a counter part to git send-email
that downloads a series from your mailbox, such that a local branch
can be transmitted to via

    "git send-email --base=origin/master --include-notes --name=sb/new-series"

and completely reconstructed (i.e. the commit sha1s even match) including
notes via:

    git fetch-email --name=sb/new-series

That way would ensure we have a "simple" way to transmit patches back and forth
and adding potential fixups.


You wrote:
> In short, I agree that our patch submission process is a saber tooth tiger
> that still reflects pre-Git times. While we use Git's tools, the workflow
> really tries to cut out Git as much as possible, in favor of pure mails
> with non-corrupted, non-HTML patches in them, a charmingly anachronistic
> requirement until you try to use state-of-the-art mail clients to send
> them.

And there are two ways out:
* either we teach git how to deal with emails (completely, i.e.
sending+receiving)
* or we change the development model (e.g. no emails any more)

There is no golden third way IMHO.

Thanks,
Stefan

  reply	other threads:[~2016-08-04 16:48 UTC|newest]

Thread overview: 262+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-29 11:36 [PATCH 0/9] Use merge_recursive() directly in the builtin am Johannes Schindelin
2016-06-29 11:36 ` [PATCH 1/9] Report bugs consistently Johannes Schindelin
2016-06-29 15:11   ` Johannes Schindelin
2016-06-29 18:12   ` Eric Sunshine
2016-06-30  8:41     ` Johannes Schindelin
2016-06-29 20:50   ` Junio C Hamano
2016-06-30  8:42     ` Johannes Schindelin
2016-06-30  9:23       ` Jeff King
2016-07-01 13:51         ` Johannes Schindelin
2016-07-01 18:16           ` Jeff King
2016-06-30  5:38   ` Johannes Sixt
2016-06-30  8:45     ` Johannes Schindelin
2016-07-02  5:11   ` Duy Nguyen
2016-07-02  7:25     ` Johannes Schindelin
2016-07-02  8:01       ` Duy Nguyen
2016-07-05 11:32         ` Johannes Schindelin
2016-06-29 11:36 ` [PATCH 2/9] merge-recursive: clarify code in was_tracked() Johannes Schindelin
2016-06-29 18:35   ` Junio C Hamano
2016-07-01  9:23     ` Johannes Schindelin
2016-07-01 15:31       ` Junio C Hamano
2016-07-02  7:20         ` Johannes Schindelin
2016-07-06 15:30           ` Junio C Hamano
2016-07-07 11:17             ` Johannes Schindelin
2016-06-29 11:36 ` [PATCH 3/9] Prepare the builtins for a libified merge_recursive() Johannes Schindelin
2016-06-29 18:56   ` Junio C Hamano
2016-07-01 10:14     ` Johannes Schindelin
2016-07-01 15:43       ` Junio C Hamano
2016-07-02  7:24         ` Johannes Schindelin
2016-06-29 11:36 ` [PATCH 4/9] merge_recursive: abort properly upon errors Johannes Schindelin
2016-06-29 20:08   ` Junio C Hamano
2016-07-01 10:16     ` Johannes Schindelin
2016-07-01 15:56       ` Junio C Hamano
2016-07-02 11:30         ` Johannes Schindelin
2016-06-29 11:36 ` [PATCH 5/9] merge-recursive: avoid returning a wholesale struct Johannes Schindelin
2016-06-29 20:21   ` Junio C Hamano
2016-07-01 13:48     ` Johannes Schindelin
2016-07-01 15:02       ` Eric Wong
2016-06-29 11:37 ` [PATCH 6/9] merge-recursive: allow write_tree_from_memory() to error out Johannes Schindelin
2016-06-29 11:37 ` [PATCH 7/9] merge-recursive: handle return values indicating errors Johannes Schindelin
2016-06-29 21:06   ` Junio C Hamano
2016-07-01 11:08     ` Johannes Schindelin
2016-06-29 11:37 ` [PATCH 8/9] merge-recursive: switch to returning errors instead of dying Johannes Schindelin
2016-06-29 21:19   ` Junio C Hamano
2016-07-01 11:14     ` Johannes Schindelin
2016-06-29 11:38 ` [PATCH 9/9] am: make a direct call to merge_recursive Johannes Schindelin
2016-06-29 17:45   ` Junio C Hamano
2016-06-30  8:38     ` Johannes Schindelin
2016-07-01 16:03       ` Junio C Hamano
2016-06-29 21:23   ` Junio C Hamano
2016-07-01 12:46     ` Johannes Schindelin
2016-07-05 11:22 ` [PATCH v2 00/17] Use merge_recursive() directly in the builtin am Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 01/17] Verify that `git pull --rebase` shows the helpful advice when failing Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 02/17] Report bugs consistently Johannes Schindelin
2016-07-05 13:05     ` Jakub Narębski
2016-07-05 13:38       ` Johannes Schindelin
2016-07-06 15:30     ` Duy Nguyen
2016-07-07 11:23       ` Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 03/17] Avoid translating bug messages Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 04/17] merge-recursive: clarify code in was_tracked() Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 05/17] Prepare the builtins for a libified merge_recursive() Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 06/17] merge_recursive: abort properly upon errors Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 07/17] merge-recursive: avoid returning a wholesale struct Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 08/17] merge-recursive: allow write_tree_from_memory() to error out Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 09/17] merge-recursive: handle return values indicating errors Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 10/17] merge-recursive: switch to returning errors instead of dying Johannes Schindelin
2016-07-05 11:23   ` [PATCH v2 11/17] am: counteract gender bias Johannes Schindelin
2016-07-06 21:22     ` Junio C Hamano
2016-07-07 11:30       ` Johannes Schindelin
2016-07-07 15:26         ` Junio C Hamano
2016-07-07 15:54           ` Johannes Schindelin
2016-07-07 16:03             ` Junio C Hamano
2016-07-05 11:24   ` [PATCH v2 12/17] am -3: use merge_recursive() directly again Johannes Schindelin
2016-07-05 11:24   ` [PATCH v2 13/17] merge-recursive: flush output buffer before printing error messages Johannes Schindelin
2016-07-05 11:24   ` [PATCH v2 14/17] merge-recursive: write the commit title in one go Johannes Schindelin
2016-07-05 11:24   ` [PATCH v2 15/17] merge-recursive: offer an option to retain the output in 'obuf' Johannes Schindelin
2016-07-05 11:24   ` [PATCH v2 16/17] Ensure that the output buffer is released after calling merge_trees() Johannes Schindelin
2016-07-05 11:24   ` [PATCH v2 17/17] merge-recursive: flush output buffer even when erroring out Johannes Schindelin
2016-07-06 21:26   ` [PATCH v2 00/17] Use merge_recursive() directly in the builtin am Junio C Hamano
2016-07-07 11:16     ` Johannes Schindelin
2016-07-07 14:35   ` [PATCH v3 00/16] " Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 01/16] Verify that `git pull --rebase` shows the helpful advice when failing Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 02/16] Report bugs consistently Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 03/16] Avoid translating bug messages Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 04/16] merge-recursive: clarify code in was_tracked() Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 05/16] Prepare the builtins for a libified merge_recursive() Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 06/16] merge_recursive: abort properly upon errors Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 07/16] merge-recursive: avoid returning a wholesale struct Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 08/16] merge-recursive: allow write_tree_from_memory() to error out Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 09/16] merge-recursive: handle return values indicating errors Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 10/16] merge-recursive: switch to returning errors instead of dying Johannes Schindelin
2016-07-07 14:35     ` [PATCH v3 11/16] am -3: use merge_recursive() directly again Johannes Schindelin
2016-07-07 14:36     ` [PATCH v3 12/16] merge-recursive: flush output buffer before printing error messages Johannes Schindelin
2016-07-07 14:36     ` [PATCH v3 13/16] merge-recursive: write the commit title in one go Johannes Schindelin
2016-07-07 14:36     ` [PATCH v3 14/16] merge-recursive: offer an option to retain the output in 'obuf' Johannes Schindelin
2016-07-07 14:36     ` [PATCH v3 15/16] Ensure that the output buffer is released after calling merge_trees() Johannes Schindelin
2016-07-07 14:36     ` [PATCH v3 16/16] merge-recursive: flush output buffer even when erroring out Johannes Schindelin
2016-07-12 21:27     ` [PATCH v3 00/16] Use merge_recursive() directly in the builtin am Junio C Hamano
2016-07-14 14:03       ` Johannes Schindelin
2016-07-14 19:39         ` Junio C Hamano
2016-07-19  0:17           ` Junio C Hamano
2016-07-19 12:31             ` Johannes Schindelin
2016-07-19 14:28               ` Johannes Schindelin
2016-07-19 19:33                 ` Junio C Hamano
2016-07-22 12:23     ` [PATCH v4 " Johannes Schindelin
2016-07-22 12:24       ` [PATCH v4 01/16] Verify that `git pull --rebase` shows the helpful advice when failing Johannes Schindelin
2016-07-25 21:39         ` Junio C Hamano
2016-07-26 12:21           ` Johannes Schindelin
2016-07-22 12:24       ` [PATCH v4 02/16] Report bugs consistently Johannes Schindelin
2016-07-25 21:44         ` Junio C Hamano
2016-07-25 22:17           ` Jeff King
2016-07-25 22:36             ` Junio C Hamano
2016-07-26 12:24               ` Johannes Schindelin
2016-07-22 12:24       ` [PATCH v4 03/16] Avoid translating bug messages Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 04/16] merge-recursive: clarify code in was_tracked() Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 05/16] Prepare the builtins for a libified merge_recursive() Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 06/16] merge_recursive: abort properly upon errors Johannes Schindelin
2016-07-25 22:09         ` Junio C Hamano
2016-07-26 12:26           ` Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 07/16] merge-recursive: avoid returning a wholesale struct Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 08/16] merge-recursive: allow write_tree_from_memory() to error out Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 09/16] merge-recursive: handle return values indicating errors Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 10/16] merge-recursive: switch to returning errors instead of dying Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 11/16] am -3: use merge_recursive() directly again Johannes Schindelin
2016-07-25 22:19         ` Junio C Hamano
2016-07-26 12:30           ` Johannes Schindelin
2016-07-26 17:12             ` Junio C Hamano
2016-07-22 12:25       ` [PATCH v4 12/16] merge-recursive: flush output buffer before printing error messages Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 13/16] merge-recursive: write the commit title in one go Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 14/16] merge-recursive: offer an option to retain the output in 'obuf' Johannes Schindelin
2016-07-22 12:25       ` [PATCH v4 15/16] Ensure that the output buffer is released after calling merge_trees() Johannes Schindelin
2016-07-22 12:26       ` [PATCH v4 16/16] merge-recursive: flush output buffer even when erroring out Johannes Schindelin
2016-07-26 16:05       ` [PATCH v5 00/16] Use merge_recursive() directly in the builtin am Johannes Schindelin
2016-07-26 16:05         ` [PATCH v5 01/16] t5520: verify that `pull --rebase` shows the helpful advice when failing Johannes Schindelin
2016-07-26 16:05         ` [PATCH v5 02/16] Report bugs consistently Johannes Schindelin
2016-07-26 16:05         ` [PATCH v5 03/16] Avoid translating bug messages Johannes Schindelin
2016-07-26 16:05         ` [PATCH v5 04/16] merge-recursive: clarify code in was_tracked() Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 05/16] Prepare the builtins for a libified merge_recursive() Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 06/16] merge_recursive: abort properly upon errors Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 07/16] merge-recursive: avoid returning a wholesale struct Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 08/16] merge-recursive: allow write_tree_from_memory() to error out Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 09/16] merge-recursive: handle return values indicating errors Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 10/16] merge-recursive: switch to returning errors instead of dying Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 11/16] am -3: use merge_recursive() directly again Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 12/16] merge-recursive: flush output buffer before printing error messages Johannes Schindelin
2016-07-27 21:37           ` Junio C Hamano
2016-07-27 21:53             ` Junio C Hamano
2016-08-01  9:18             ` Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 13/16] merge-recursive: write the commit title in one go Johannes Schindelin
2016-07-27 22:36           ` Junio C Hamano
2016-08-01  9:53             ` Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 14/16] merge-recursive: offer an option to retain the output in 'obuf' Johannes Schindelin
2016-07-27 22:09           ` Junio C Hamano
2016-07-28  0:17             ` Junio C Hamano
2016-08-01  9:34               ` Johannes Schindelin
2016-08-01 19:09                 ` Junio C Hamano
2016-08-02  8:01                   ` Johannes Schindelin
2016-08-02 21:19                     ` Junio C Hamano
2016-08-01  9:35             ` Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 15/16] Ensure that the output buffer is released after calling merge_trees() Johannes Schindelin
2016-07-27 22:15           ` Junio C Hamano
2016-08-01  9:40             ` Johannes Schindelin
2016-07-26 16:06         ` [PATCH v5 16/16] merge-recursive: flush output buffer even when erroring out Johannes Schindelin
2016-07-27 22:20           ` Junio C Hamano
2016-08-01  9:49             ` Johannes Schindelin
2016-08-01 18:32               ` Junio C Hamano
2016-08-01 11:36         ` [PATCH v6 00/16] Use merge_recursive() directly in the builtin am Johannes Schindelin
2016-08-01 11:36           ` [PATCH v6 01/16] t5520: verify that `pull --rebase` shows the helpful advice when failing Johannes Schindelin
2016-08-01 11:36           ` [PATCH v6 02/16] Report bugs consistently Johannes Schindelin
2016-08-01 11:43           ` [PATCH v6 03/16] Avoid translating bug messages Johannes Schindelin
2016-08-01 11:44           ` [PATCH v6 04/16] merge-recursive: clarify code in was_tracked() Johannes Schindelin
2016-08-01 11:44           ` [PATCH v6 05/16] Prepare the builtins for a libified merge_recursive() Johannes Schindelin
2016-08-01 18:40             ` Junio C Hamano
2016-08-02  8:02               ` Johannes Schindelin
2016-08-01 11:44           ` [PATCH v6 06/16] merge_recursive: abort properly upon errors Johannes Schindelin
2016-08-01 18:41             ` Junio C Hamano
2016-08-02  8:12               ` Johannes Schindelin
2016-08-02 21:26                 ` Junio C Hamano
2016-08-03 11:59                   ` patch submission process, was " Johannes Schindelin
2016-08-03 15:33                     ` Junio C Hamano
2016-08-03 16:07                       ` Johannes Schindelin
2016-08-03 17:47                         ` Stefan Beller
2016-08-04 15:58                           ` Johannes Schindelin
2016-08-04 16:42                             ` Stefan Beller [this message]
2016-08-04 20:17                               ` Eric Wong
2016-08-05  8:24                                 ` Johannes Schindelin
2016-08-05  8:50                                   ` Eric Wong
2016-08-05  8:20                               ` Johannes Schindelin
2016-08-05 17:59                                 ` Stefan Beller
2016-08-05 19:21                                   ` Josh Triplett
2016-08-05 21:01                                   ` Eric Wong
2016-08-06  8:58                                   ` Johannes Schindelin
2016-08-06 18:33                                     ` Junio C Hamano
2016-08-06 21:43                                       ` Eric Wong
2016-08-07  8:46                                         ` Johannes Schindelin
2016-08-08 17:22                                           ` Junio C Hamano
2016-08-09 11:48                                             ` Johannes Schindelin
2016-08-07 11:09                                     ` Lars Schneider
2016-08-08 17:29                                       ` Junio C Hamano
2016-08-09 11:41                                         ` Johannes Schindelin
2016-08-09 17:25                                           ` Junio C Hamano
2016-08-05 18:46                                 ` Eric Wong
2016-08-06  8:44                                   ` Johannes Schindelin
2016-08-05 11:59                               ` Richard Ipsum
2016-08-05 15:24                                 ` Johannes Schindelin
2016-08-06 16:45                                   ` Richard Ipsum
2016-08-08 22:20                             ` Michael Haggerty
2016-08-08 22:36                               ` Junio C Hamano
2016-08-08 23:20                                 ` Michael Haggerty
2016-08-09  8:11                                   ` Michael J Gruber
2016-08-09 10:57                                     ` Jeff King
2016-08-10  0:46                                       ` Josh Triplett
2016-08-09 11:37                                   ` Jeff King
2016-08-09 17:34                                     ` Junio C Hamano
2016-08-09 17:50                                       ` Jeff King
2016-08-09 19:19                                         ` Junio C Hamano
2016-08-09 18:43                                     ` Duy Nguyen
2016-08-09 18:50                                       ` Stefan Beller
2016-08-09 18:58                                         ` Jeff King
2016-08-09 18:55                                       ` Jeff King
2016-08-09 18:36                                   ` Duy Nguyen
2016-08-09 18:38                                     ` Duy Nguyen
2016-08-09  4:22                               ` Duy Nguyen
2016-08-09  9:17                                 ` Richard Ipsum
2016-08-09 10:34                                   ` Jeff King
2016-08-09 10:19                                 ` Michael Haggerty
2016-08-09 12:07                               ` Johannes Schindelin
2016-08-09 18:28                               ` Eric Wong
2016-08-10  0:55                                 ` Josh Triplett
2016-08-10  1:57                                   ` Eric Wong
2016-08-10  7:30                                   ` Jakub Narębski
2016-08-10 19:30                                     ` Josh Triplett
2016-08-10 21:14                                       ` Junio C Hamano
2016-08-05 14:55                         ` Duy Nguyen
2016-08-05 15:13                           ` Johannes Schindelin
2016-08-05 18:42                           ` Philip Oakley
2016-08-06  8:38                             ` Johannes Schindelin
2016-08-06 17:45                               ` Philip Oakley
2016-08-03 16:34                       ` Jeff King
2016-08-03 16:53                         ` Junio C Hamano
2016-08-03 16:56                           ` Jeff King
2016-08-04 15:29                             ` Johannes Schindelin
2016-08-04 18:07                               ` Jeff King
2016-08-04 21:12                                 ` Junio C Hamano
2016-08-05  8:17                                   ` Jeff King
2016-08-05 15:51                                   ` Johannes Schindelin
2016-08-02 22:28                 ` Junio C Hamano
2016-08-01 11:44           ` [PATCH v6 07/16] merge-recursive: avoid returning a wholesale struct Johannes Schindelin
2016-08-04 18:09             ` Junio C Hamano
2016-08-01 11:44           ` [PATCH v6 08/16] merge-recursive: allow write_tree_from_memory() to error out Johannes Schindelin
2016-08-04 18:14             ` Junio C Hamano
2016-08-01 11:44           ` [PATCH v6 09/16] merge-recursive: handle return values indicating errors Johannes Schindelin
2016-08-01 11:44           ` [PATCH v6 10/16] merge-recursive: switch to returning errors instead of dying Johannes Schindelin
2016-08-01 11:44           ` [PATCH v6 11/16] am -3: use merge_recursive() directly again Johannes Schindelin
2016-08-01 11:44           ` [PATCH v6 12/16] merge-recursive: flush output buffer before printing error messages Johannes Schindelin
2016-08-01 11:44           ` [PATCH v6 13/16] merge-recursive: write the commit title in one go Johannes Schindelin
2016-08-01 11:44           ` [PATCH v6 14/16] merge-recursive: offer an option to retain the output in 'obuf' Johannes Schindelin
2016-08-01 11:44           ` [PATCH v6 15/16] Ensure that the output buffer is released after calling merge_trees() Johannes Schindelin
2016-08-04 18:18             ` Junio C Hamano
2016-08-01 11:44           ` [PATCH v6 16/16] merge-recursive: flush output buffer even when erroring out Johannes Schindelin
2016-08-04 18:20             ` Junio C Hamano
2016-08-05 15:41               ` Johannes Schindelin
2016-08-06 16:37                 ` 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

  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=CAGZ79kaTT3NgKj8akB8t9b1BF3i6sXe7Un9oq5KP8077Wz-E+g@mail.gmail.com \
    --to=sbeller@google.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=jnareb@gmail.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.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).