From: John Keeping <john@keeping.me.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ramkumar Ramachandra <artagnon@gmail.com>,
Git List <git@vger.kernel.org>
Subject: Re: [BUG] Highly inconsistent diff UI
Date: Mon, 29 Apr 2013 19:32:05 +0100 [thread overview]
Message-ID: <20130429183205.GO472@serenity.lan> (raw)
In-Reply-To: <7vhaipl2ks.fsf@alter.siamese.dyndns.org>
On Mon, Apr 29, 2013 at 09:32:51AM -0700, Junio C Hamano wrote:
> *1* Instead, you have a separate integration branch for testing that
> merges other's work and your topic.
<shameless-plug>
I wrote a script to help manage this [1]. It doesn't do everything I
want it to yet but I'm using it on a daily basis to maintain a Git
version consisting of pu plus a few changes that I'm working on which
aren't ready for submission yet as well as for maintaining integration
branches in a couple of other projects.
You can create an integration branch on top of pu quickly with:
git integration --create my-integration-branch pu \
--add my-feature-branch --rebuild
And then whenever you want to rebuild with your latest changes (or on
top of the latest pu):
git integration --rebuild my-integration-branch
[1] http://johnkeeping.github.io/git-integration/
next prev parent reply other threads:[~2013-04-29 18:32 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-24 12:23 [BUG] Highly inconsistent diff UI Ramkumar Ramachandra
2013-04-24 16:40 ` Jonathan Nieder
2013-04-24 17:49 ` Junio C Hamano
2013-04-24 18:12 ` Ramkumar Ramachandra
2013-04-24 19:23 ` Jonathan Nieder
2013-04-24 20:02 ` Junio C Hamano
2013-04-24 20:14 ` Ramkumar Ramachandra
2013-04-24 16:44 ` [BUG] " Junio C Hamano
2013-04-24 16:51 ` Ramkumar Ramachandra
2013-04-24 18:11 ` Junio C Hamano
2013-04-24 18:48 ` Ramkumar Ramachandra
2013-04-24 19:00 ` Ramkumar Ramachandra
2013-04-24 19:24 ` Junio C Hamano
2013-04-24 19:29 ` Ramkumar Ramachandra
2013-04-24 21:27 ` Junio C Hamano
2013-04-24 22:06 ` Ramkumar Ramachandra
2013-04-24 20:44 ` Thomas Rast
2013-04-24 20:54 ` Ramkumar Ramachandra
2013-04-24 21:02 ` Jonathan Nieder
2013-04-24 21:10 ` Ramkumar Ramachandra
2013-04-25 7:32 ` Thomas Rast
2013-04-25 8:06 ` Ramkumar Ramachandra
2013-04-25 16:37 ` Junio C Hamano
2013-04-25 17:11 ` Ramkumar Ramachandra
2013-04-25 23:21 ` Jonathan Nieder
2013-04-25 23:39 ` Junio C Hamano
2013-04-26 12:34 ` Duy Nguyen
2013-04-24 21:25 ` Phil Hord
2013-04-24 21:23 ` Junio C Hamano
2013-04-24 22:44 ` Ramkumar Ramachandra
2013-04-24 23:17 ` Ramkumar Ramachandra
2013-04-25 5:59 ` Junio C Hamano
2013-04-25 7:51 ` Ramkumar Ramachandra
2013-04-25 9:30 ` Ramkumar Ramachandra
2013-04-26 10:47 ` Ramkumar Ramachandra
2013-04-26 11:35 ` Ramkumar Ramachandra
2013-04-29 16:32 ` Junio C Hamano
2013-04-29 18:21 ` Ramkumar Ramachandra
2013-04-29 18:43 ` Junio C Hamano
2013-04-29 19:03 ` Ramkumar Ramachandra
2013-04-29 19:17 ` Ramkumar Ramachandra
2013-04-29 19:56 ` Junio C Hamano
2013-04-29 21:12 ` Ramkumar Ramachandra
2013-04-29 18:32 ` John Keeping [this message]
2013-04-25 4:27 ` Ramkumar Ramachandra
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=20130429183205.GO472@serenity.lan \
--to=john@keeping.me.uk \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.