All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann Dirson <ydirson@altern.org>
To: Pavel Roskin <proski@gnu.org>
Cc: Catalin Marinas <catalin.marinas@gmail.com>, git@vger.kernel.org
Subject: Re: StGIT discards local commits on "stg pull"
Date: Tue, 20 Feb 2007 01:00:59 +0100	[thread overview]
Message-ID: <20070220000059.GK4248@nan92-1-81-57-214-146.fbx.proxad.net> (raw)
In-Reply-To: <1171927720.2257.41.camel@dv>

On Mon, Feb 19, 2007 at 06:28:40PM -0500, Pavel Roskin wrote:
> > I think the fail-safe solution would be to leave the old behaviour
> > (i.e. git-pull and pull-does-rebase=no) and people that need to pull
> > from branches like that described above would use the fetch+rebase
> > approach. Ideally, we'll have this configurable per-branch (and could
> > leave the global one as well if the most specific is not available,
> > but should default to git-pull).
> 
> By the way, it would be great to reduce all complexity to "one bit" per
> branch.  If stgit.internal-pull (the name is subject to improvement) is
> on, "stgit pull" calls git-fetch and does rebase.  Otherwise, it calls
> git-pull.  No need to configure two variables per branch.

Being able to specify the command to use makes it possible to hook to
other SCM's (eg. using git-cvsimport, git-svn or similar).

I'll try to adapt by stg-cvs script to fit into this model some day
(indeed, "pullcmd = stg-cvs fetch" may indeed already work).

Best regards,
-- 
Yann.

  reply	other threads:[~2007-02-20  0:49 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-12  7:26 StGIT discards local commits on "stg pull" Pavel Roskin
2007-02-12  9:31 ` Catalin Marinas
2007-02-12 20:26   ` Yann Dirson
2007-02-12 21:47     ` Yann Dirson
2007-02-19 23:07       ` Catalin Marinas
2007-02-19 23:28         ` Pavel Roskin
2007-02-20  0:00           ` Yann Dirson [this message]
2007-02-20 18:55             ` Yann Dirson
2007-02-19 23:44         ` Yann Dirson
2007-02-13  0:20   ` Pavel Roskin
2007-02-13 22:48     ` Catalin Marinas
2007-02-19 20:47       ` 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=20070220000059.GK4248@nan92-1-81-57-214-146.fbx.proxad.net \
    --to=ydirson@altern.org \
    --cc=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=proski@gnu.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 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.