From: Junio C Hamano <gitster@pobox.com>
To: Luke Diamand <luke@diamand.org>
Cc: Git Users <git@vger.kernel.org>, Pete Wyckoff <pw@padd.com>
Subject: Re: Is there a way to find out which commit "git rebase --skip" skipped?
Date: Thu, 16 Aug 2012 08:43:42 -0700 [thread overview]
Message-ID: <7va9xu3kr5.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAE5ih78tYrX0F3AZ3vrE2p=_h24njhU_rTGEqbBHfJGkGuHmpw@mail.gmail.com> (Luke Diamand's message of "Thu, 16 Aug 2012 07:59:39 +0100")
Luke Diamand <luke@diamand.org> writes:
> If I do "git rebase --skip", is there a way to find out the commit SHA
> that was skipped (other than just parsing the output of the command) ?
There currently isn't, and I do not think it is doable in general
when the command ever gives control back to the user to futz with
the history, expecting the user only to fix up the conflict and make
a single commit (in which case you would want to say "that old
commit was replayed as this commit with different patch id) or say
"rebase --skip" (in which case you could record "that old commit was
manually skipped), but the user can do other things like resetting
the head to lose commits that have been rebased already, adding new
commits manually before continuing, etc., all of which will be done
outside of your control.
next prev parent reply other threads:[~2012-08-16 15:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-16 6:59 Is there a way to find out which commit "git rebase --skip" skipped? Luke Diamand
2012-08-16 15:43 ` Junio C Hamano [this message]
2012-08-17 9:32 ` Luke Diamand
2012-08-17 17:48 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7va9xu3kr5.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=luke@diamand.org \
--cc=pw@padd.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.
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 NNTP newsgroup(s).