Linux PARISC architecture development
 help / color / mirror / Atom feed
From: Matthew Wilcox <matthew@wil.cx>
To: Thibaut VARENE <T-Bone@parisc-linux.org>
Cc: parisc-linux@parisc-linux.org
Subject: Re: [parisc-linux] Proposal for git tree management
Date: Mon, 9 Oct 2006 12:06:52 -0600	[thread overview]
Message-ID: <20061009180652.GB28254@parisc-linux.org> (raw)
In-Reply-To: <7d01f9f00610090439g763c9260q257fad185bbdf326@mail.gmail.com>

On Mon, Oct 09, 2006 at 01:39:58PM +0200, Thibaut VARENE wrote:
> >Please just make it "KISS". I'm only using git a few times per month
> >and it's just not enough to do anything complicated right now.
> >My goal is any git commits I make can (indirectly via kyle) go
> >to linus without the confusion you described.
> 
> I'd also strongly support a KISS approach. Yet I was under the
> impression that rebasing the tree would break any subsequent 'git
> pull' on older trees, is that right?

Yes.  And no.  It depends ;-)

If your refspec looks like this:

$ cat .git/remotes/origin 
URL: ssh://git.parisc-linux.org/var/git/linux-2.6.git
Pull: refs/heads/master:refs/heads/origin
Pull: refs/heads/linus:refs/heads/linus

then it's going to whinge about not being able to fast-forward.
However, if you add a +, like this:

Pull: +refs/heads/master:refs/heads/origin

then it'll update the ref, even if it's not a fast-forward.

> Along those lines I'm also thinking that assuming we want to revive
> our kernel autobuilder, we probably want to think of a git tree
> architecture that will induce minimal man handling of the autobuilder
> once started...

I agree, though I wouldn't expect rebasing to be a common operation
(every 2-3 months), it would suck to inadvertently break the autobuilder.
_______________________________________________
parisc-linux mailing list
parisc-linux@lists.parisc-linux.org
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux

  reply	other threads:[~2006-10-09 18:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-08  0:41 [parisc-linux] Proposal for git tree management Matthew Wilcox
2006-10-09  3:29 ` Grant Grundler
2006-10-09 11:39   ` Thibaut VARENE
2006-10-09 18:06     ` Matthew Wilcox [this message]
2006-10-09 18:15       ` Kyle McMartin

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=20061009180652.GB28254@parisc-linux.org \
    --to=matthew@wil.cx \
    --cc=T-Bone@parisc-linux.org \
    --cc=parisc-linux@parisc-linux.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