Git development
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@dev.mellanox.co.il>
To: Junio C Hamano <junkio@cox.net>,
	Catalin Marinas <catalin.marinas@arm.com>,
	git@vger.kernel.org, Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
Subject: using stgit/guilt for public branches
Date: Wed, 25 Apr 2007 15:20:49 +0300	[thread overview]
Message-ID: <20070425122048.GD1624@mellanox.co.il> (raw)

Hi!
On git.openfabrics.org we use git to manage all code for our OFED distribution.
For our kernel code we basically started with 2.6.20, and add some patches,
which we currently keep separate from upstream kernel source - this makes
it possible to update from upstream and extract the patches to post
them for upstream inclusion easily.

On the surface, it looks like using stg or guilt would be a good idea for us,
however multiple people need to collaborate on the patch series.

I am concerned that publishing a git branch managed by stg/guilt
would present problems: it seems that every time patches are re-ordered,
a patch is re-written or removed, or we update from upstream,
everyone who pulls the tree branch will have a hard-to-resolve conflict.

Is that really a problem? If so, would it be possible to work around this somehow?

Thanks,

-- 
MST

             reply	other threads:[~2007-04-25 12:20 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-25 12:20 Michael S. Tsirkin [this message]
2007-04-25 19:18 ` using stgit/guilt for public branches Josef Sipek
2007-04-25 19:52   ` Michael S. Tsirkin
2007-04-25 20:40     ` Josef Sipek
2007-04-25 21:37   ` Robin Rosenberg
2007-05-03 20:58     ` Yann Dirson
2007-05-03 23:10       ` Robin Rosenberg
2007-05-03 23:31         ` Robin Rosenberg
2007-05-04 21:28           ` Yann Dirson
2007-05-04  5:20       ` Michael S. Tsirkin
2007-05-04 21:37         ` Yann Dirson
2007-05-04 23:12       ` Yann Dirson

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=20070425122048.GD1624@mellanox.co.il \
    --to=mst@dev.mellanox.co.il \
    --cc=catalin.marinas@arm.com \
    --cc=git@vger.kernel.org \
    --cc=jsipek@cs.sunysb.edu \
    --cc=junkio@cox.net \
    /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