From: Andrew Wong <andrew.w@sohovfx•com>
To: Peter Krefting <peter@softwolves•pp.se>
Cc: Git Mailing List <git@vger•kernel.org>
Subject: Re: Interactive rebase with pre-built script?
Date: Thu, 13 Sep 2012 14:08:31 -0400 [thread overview]
Message-ID: <5052211F.6060000@sohovfx.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1209131431580.20765@ds9.cixit.se>
On 09/13/2012 09:33 AM, Peter Krefting wrote:
>> But this could potentially be dangerous because if "rebase" fires up
>> a editor for any other reason (e.g. having a "reword" or "squash" in
>> your recipe), then the commit message will be messed up. So you need
>> to make sure your recipe won't trigger any editor except for the recipe.
> Indeed, that's why I don't want to do that.
Are you expecting to have "reword" or "squash" in your recipe? If not, I
think you should be safe.
If there's a conflict, then rebase will stop, and next time you run "git
rebase --continue", your normal editor will be back.
From your original description, it sounded like you are only doing "pick".
On 09/13/2012 09:33 AM, Peter Krefting wrote:
> Perhaps I should add some switch that would append the contents of a
> specific file to the prebuild recipe, I guess that should be fairly
> easy. The question is what to call the switch.
How about calling the switch "--todo"? i.e. "rebase -i --todo my_recipe"
Can we also get some inputs from others on whether adding this switch to
"rebase -i" is desirable?
On 09/11/2012 11:35 AM, Junio C Hamano wrote:
> Using "git cherry-pick $(git rev-list --reverse .....)" ought to work.
And I assume what Junio suggested doesn't help with your problem?
Because of the time skewed behavior?
prev parent reply other threads:[~2012-09-13 18:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 6:32 Interactive rebase with pre-built script? Peter Krefting
2012-09-11 15:35 ` Junio C Hamano
2012-09-12 16:38 ` Andrew Wong
2012-09-13 13:33 ` Peter Krefting
2012-09-13 18:08 ` Andrew Wong [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=5052211F.6060000@sohovfx.com \
--to=andrew.w@sohovfx$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peter@softwolves$(echo .)pp.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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