From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>,
Orgad Shaneh <orgads@gmail.com>
Subject: Re: [PATCH 4/4] built-in rebase: call `git am` directly
Date: Fri, 18 Jan 2019 19:14:03 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1901181912460.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqimylludk.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Fri, 18 Jan 2019, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> >> Overall, this was quite a pleasant read and a well constructed
> >> series. Other than two minor points (i.e. interaction with the
> >> 'post-checkout hook' topic, and discard_cache() before calling
> >> move_to_original_branch) I did not quite understand, looks good to
> >> me.
> >>
> >> When merged to 'pu', I seem to be getting failure from t3425.5, .8
> >> and .11, by the way. I haven't dug into the actual breakages any
> >> further than that.
> >
> > Sorry for the trouble, and for my silence (I was heads-down into the Azure
> > Pipelines support).
> >
> > I did not see any breakage in `pu` lately, hopefully things resolved
> > themselves?
>
> The (semantic) conflict resolution can be seen in
>
> $ git show 'origin/pu^{/^Merge branch .js/rebase-am. into}'
>
> which is recorded in my rerere database ;-)
That looks all good to me, with the minor nit that you did not wrap at
<= 80 columns/row:
- "--no-cover-letter", "--pretty=mboxrd", NULL);
++ "--no-cover-letter", "--pretty=mboxrd", "--topo-order", NULL);
I am not a stickler to this line length rule, though, as I long switched
away from the 80x25 screen and can easily resize my text windows.
Ciao,
Dscho
next prev parent reply other threads:[~2019-01-18 18:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-21 13:17 [PATCH 0/4] Let the builtin rebase call the git am command directly Johannes Schindelin via GitGitGadget
2018-12-21 13:17 ` [PATCH 1/4] rebase: move `reset_head()` into a better spot Johannes Schindelin via GitGitGadget
2019-01-04 18:39 ` Junio C Hamano
2018-12-21 13:17 ` [PATCH 2/4] rebase: avoid double reflog entry when switching branches Johannes Schindelin via GitGitGadget
2019-01-04 18:38 ` Junio C Hamano
2019-01-18 14:18 ` Johannes Schindelin
2018-12-21 13:17 ` [PATCH 3/4] rebase: teach `reset_head()` to optionally skip the worktree Johannes Schindelin via GitGitGadget
2019-01-04 18:38 ` Junio C Hamano
2019-01-04 18:40 ` Junio C Hamano
2019-01-18 14:18 ` Johannes Schindelin
2018-12-21 13:17 ` [PATCH 4/4] built-in rebase: call `git am` directly Johannes Schindelin via GitGitGadget
2019-01-04 18:38 ` Junio C Hamano
2019-01-18 14:15 ` Johannes Schindelin
2019-01-18 17:59 ` Junio C Hamano
2019-01-18 18:14 ` Johannes Schindelin [this message]
2019-01-04 23:19 ` Junio C Hamano
2019-01-07 17:19 ` Junio C Hamano
2019-01-18 15:09 ` [PATCH v2 0/4] Let the builtin rebase call the git am command directly Johannes Schindelin via GitGitGadget
2019-01-18 15:09 ` [PATCH v2 1/4] rebase: move `reset_head()` into a better spot Johannes Schindelin via GitGitGadget
2019-01-18 15:09 ` [PATCH v2 2/4] rebase: avoid double reflog entry when switching branches Johannes Schindelin via GitGitGadget
2019-01-18 15:09 ` [PATCH v2 3/4] rebase: teach `reset_head()` to optionally skip the worktree Johannes Schindelin via GitGitGadget
2019-01-18 15:09 ` [PATCH v2 4/4] built-in rebase: call `git am` directly Johannes Schindelin via GitGitGadget
2019-01-26 21:13 ` Alban Gruin
2019-01-29 9:46 ` Johannes Schindelin
2019-01-18 18:06 ` [PATCH v2 0/4] Let the builtin rebase call the git am command directly Junio C Hamano
2019-01-18 20:13 ` Junio C Hamano
2019-01-18 20:31 ` Johannes Schindelin
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=nycvar.QRO.7.76.6.1901181912460.41@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=orgads@gmail.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).