From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Oct 2019 04:34:25 +0000 (+0900)
Subject: Merge branch 'js/advise-rebase-skip' into jch
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f6d263cae2fa67a3b0d1043a5bdf97053a90bdc;p=git

Merge branch 'js/advise-rebase-skip' into jch

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.

* js/advise-rebase-skip:
  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`
---

1f6d263cae2fa67a3b0d1043a5bdf97053a90bdc