git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>,
	Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: git@vger.kernel.org
Subject: js/advise-rebase-skip, was Re: What's cooking in git.git (Dec 2019, #02; Thu, 5)
Date: Fri, 6 Dec 2019 16:56:53 +0100 (CET)	[thread overview]
Message-ID: <nycvar.QRO.7.76.6.1912061653370.31080@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqzhg6xuvc.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Thu, 5 Dec 2019, Junio C Hamano wrote:

> * js/advise-rebase-skip (2019-10-23) 3 commits
>  - commit: give correct advice for empty commit during a rebase
>  - sequencer: export the function to get the path of `.git/rebase-merge/`
>  - cherry-pick: add test for `--skip` advice in `git commit`
>
>  The logic used in "git commit" to give hints and errors depending
>  on what operation was in progress learned to distinguish rebase and
>  cherry-pick better.
>
>  Kicked back to 'pu'.
>  cf. <nycvar.QRO.7.76.6.1911081508560.46@tvgsbejvaqbjf.bet>

Phillip already opened a GitGitGadget PR to replace this, and it will soon
hit the Git mailing list, I think (or it already did and I missed it):
https://github.com/gitgitgadget/git/pull/484

Feel free to drop my patches as soon as you integrate Phillips'.

Ciao,
Dscho

      parent reply	other threads:[~2019-12-06 15:57 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-05 22:36 What's cooking in git.git (Dec 2019, #02; Thu, 5) Junio C Hamano
2019-12-06 15:20 ` am/pathspec-f-f-checkout, was " Johannes Schindelin
2019-12-06 15:23   ` es/pathspec-f-f-grep, was Re: am/pathspec-f-f-checkout Johannes Schindelin
2019-12-06 16:27     ` Junio C Hamano
2019-12-06 15:52 ` ag/edit-todo-drop-check, Re: What's cooking in git.git (Dec 2019, #02; Thu, 5) Johannes Schindelin
2019-12-06 15:56 ` Johannes Schindelin [this message]

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.1912061653370.31080@tvgsbejvaqbjf.bet \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood@dunelm.org.uk \
    /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).