From: Ricardo Biehl Pasquali <pasqualirb@gmail.com>
To: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Cc: Kevin Daudt <me@ikke.info>, git@vger.kernel.org
Subject: Re: rebase: Ask before doing anything not undoable
Date: Thu, 20 Dec 2018 22:23:36 -0200 [thread overview]
Message-ID: <20181221002336.GA10482@localhost.localdomain> (raw)
In-Reply-To: <53e97c08-1eaf-5f83-a699-5666376bb4c4@virtuell-zuhause.de>
On Thu, Dec 20, 2018 at 10:37:00PM +0100, Thomas Braun wrote:
> The git rebase documentation has
>
> ORIG_HEAD is set to point at the tip of the branch before the reset.
>
> so doing
>
> git reset ORIG_HEAD
>
> does reset to the state before the rebase.
That's pretty easy :-)
> For avoiding the original problem of --co completing to
> --committer-date-is-author-date I'm using the alias rc for git rebase
> --continue.
It's definetly an alternative. Anyway, ORIG_HEAD reset is
sufficient for the cases when enter is hit before noticing
the completion string.
Thank you!
pasquali
prev parent reply other threads:[~2018-12-21 0:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-20 17:33 rebase: Ask before doing anything not undoable Ricardo Biehl Pasquali
2018-12-20 18:28 ` Thomas Braun
2018-12-20 18:56 ` Ricardo Biehl Pasquali
[not found] ` <20181220182653.GB4823@alpha>
2018-12-20 21:11 ` Ricardo Biehl Pasquali
2018-12-20 21:37 ` Thomas Braun
2018-12-21 0:23 ` Ricardo Biehl Pasquali [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181221002336.GA10482@localhost.localdomain \
--to=pasqualirb@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@ikke.info \
--cc=thomas.braun@virtuell-zuhause.de \
/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).