From: Jeff King <peff@peff.net>
To: Daniel Knittl-Frank <knittl89@googlemail.com>
Cc: Hugh Davenport <hugh@davenport.net.nz>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Possible git bug
Date: Wed, 14 Aug 2013 02:53:40 -0400 [thread overview]
Message-ID: <20130814065339.GA3744@sigill.intra.peff.net> (raw)
In-Reply-To: <CACx-yZ3Ba2vU4Jhjdtp1Ko=VjwarDkdHtN7ZFCzrU9Pz7-+S_Q@mail.gmail.com>
On Wed, Aug 14, 2013 at 07:42:11AM +0200, Daniel Knittl-Frank wrote:
> > So would that be a bug? Or maybe a feature? I would like it that
> > when you do a rebase and select no commits, it will rebase ontop of
> > the commit you chose, and remove all the commits not shown in the
> > interactive listing (so all).
>
> You can just use `git reset --hard <commit to rollback to>` to
> discard all commits after the given commit (Unless they're part of
> another branch, of course). `git reset --soft` if you want to keep the
> state of your current working directory.
You can also use a "noop" line in the rebase instruction list rather
than a completely blank list to mean "yes, really, do not apply any
commits".
-Peff
next prev parent reply other threads:[~2013-08-14 6:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-14 4:50 Possible git bug Hugh Davenport
2013-08-14 5:42 ` Daniel Knittl-Frank
2013-08-14 6:53 ` Jeff King [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-09-16 21:21 [PATCH] Document `rebase.forkpoint` in rebase man page Junio C Hamano
2021-09-16 22:35 ` Possible git bug wesley
2021-09-16 22:46 ` wesley
2021-09-16 3:29 Wesley Schwengle
2021-09-16 5:37 ` Taylor Blau
2021-09-16 12:07 ` Wesley Schwengle
2021-09-16 12:47 ` wesley
2021-09-16 15:33 ` Junio C Hamano
2021-09-16 19:39 ` Wesley Schwengle
2021-09-16 21:52 ` Junio C Hamano
2021-09-16 22:30 ` Wesley Schwengle
2009-01-17 13:52 Damon LaCrosse
2009-01-17 15:16 ` 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=20130814065339.GA3744@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=hugh@davenport.net.nz \
--cc=knittl89@googlemail.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).