From: Felipe Contreras <felipe.contreras@gmail.com>
To: John Keeping <john@keeping.me.uk>
Cc: git@vger.kernel.org
Subject: Re: [ANNOUNCE] git reintegrate 0.1; manager of integration branches
Date: Sat, 2 Nov 2013 05:18:35 -0600 [thread overview]
Message-ID: <CAMP44s2pydOZOdHEzDOm+57LbiFr-QgAE_3Xk6QfpDULMAs9xQ@mail.gmail.com> (raw)
In-Reply-To: <20131102110028.GD24023@serenity.lan>
On Sat, Nov 2, 2013 at 5:00 AM, John Keeping <john@keeping.me.uk> wrote:
> On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote:
>> One feature that is missing from git-integration is the ability to
>> parse existing integration branches.
>
> Nice - I'd never thought of doing this.
I tried to provide all the functionality of todo:Reintegrate, or at
least the important one.
>> It also has support for "evil merges", so it should be perfectly
>> usable for git.git maintenance.
>
> By this, do you mean that you have an ability to squash a fixup into the
> merge? If so, how do you handle this in the status display - I've had a
> WIP branch for a while but haven't come up with a satisfactory way of
> displaying the status of a fixup.
Yes, I did basically what you did, however, I skipped the status part.
I think it's more important to be able to do these fixups, even if
they don't show on the status.
And to be honest I don't care much about the status feature in general.
Cheers.
--
Felipe Contreras
prev parent reply other threads:[~2013-11-02 11:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-01 12:35 [ANNOUNCE] git reintegrate 0.1; manager of integration branches Felipe Contreras
2013-11-02 11:00 ` John Keeping
2013-11-02 11:18 ` Felipe Contreras [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=CAMP44s2pydOZOdHEzDOm+57LbiFr-QgAE_3Xk6QfpDULMAs9xQ@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
/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).