Git development
 help / color / mirror / Atom feed
From: Mark Blakeney <markb@berlios.de>
To: git@vger.kernel.org
Subject: Re: git rebase stops on empty commits
Date: Wed, 22 Jul 2009 12:29:19 +0000 (UTC)	[thread overview]
Message-ID: <loom.20090722T120617-839@post.gmane.org> (raw)
In-Reply-To: alpine.DEB.2.00.0907220907550.9220@ds9.cixit.se

Peter Krefting <peter <at> softwolves.pp.se> writes:
> If you edit the commit, you claim ownership of it. You should probably try 
> using the -C option to commit, it should allow you to edit the message, 
> while keeping the authorship and timestamp intact.

Thanks Peter, that works well. E.g.

    % git rebase --continue
    Finished one cherry-pick.
    # Not currently on any branch.
    nothing to commit (working directory clean)
    Could not apply c33a375... Stop LNCC until OPC connection
    % git commit --allow-empty -C c33a375
    [detached HEAD e7d66f4] Stop LNCC until OPC connection
    % git rebase --continue
    ....

So rebase can actually do what I want but my fundamental issue remains. I said
"pick" in the rebase for all of these commits but rebase is forcing me to do
each one manually! And it requires some rather arcane git magic that could only
be procured from a guru on a mailing list. :)

Surely something like an option --allow-empty on the rebase -i to skip over
these no-brainer picks is trivial to implement - and makes sense? As a simple
user, and knowing the original commits required --allow-empty, it was the first
option I went looking for on the rebase -i when I encountered this problem.

  reply	other threads:[~2009-07-22 12:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-22  7:22 git rebase stops on empty commits Mark Blakeney
2009-07-22  7:44 ` Mark Blakeney
2009-07-22  8:08   ` Peter Krefting
2009-07-22 12:29     ` Mark Blakeney [this message]
2009-07-22 22:08       ` Nanako Shiraishi
2009-07-22 23:01         ` Mark Blakeney

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=loom.20090722T120617-839@post.gmane.org \
    --to=markb@berlios.de \
    --cc=git@vger.kernel.org \
    /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