From: Nanako Shiraishi <nanako3@lavabit.com>
To: Mark Blakeney <markb@berlios.de>
Cc: git@vger.kernel.org
Subject: Re: git rebase stops on empty commits
Date: Thu, 23 Jul 2009 07:08:12 +0900 [thread overview]
Message-ID: <20090723070812.6117@nanako3.lavabit.com> (raw)
In-Reply-To: <loom.20090722T120617-839@post.gmane.org>
Quoting Mark Blakeney <markb@berlios.de>
> 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.
I think an alternative is to use 'git rebase --skip'. I don't understand why you can't get rid of the commits that don't do anything and serve no purpose once and for all.
In your first message you only said 'for various reasons' and it isn't clear why you need such empty commits. Often people say they want to add a comment about the state of the tree with empty commits, but tags are designed for that purpose. Unlike some other systems a tag can have a message of its own.
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
next prev parent reply other threads:[~2009-07-22 22:08 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
2009-07-22 22:08 ` Nanako Shiraishi [this message]
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=20090723070812.6117@nanako3.lavabit.com \
--to=nanako3@lavabit.com \
--cc=git@vger.kernel.org \
--cc=markb@berlios.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