git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luke Diamand <luke@diamand.org>
To: git <git@vger.kernel.org>
Subject: git-p4: keeping p4 and git in sync?
Date: Fri, 06 May 2011 22:39:27 +0100	[thread overview]
Message-ID: <4DC46A8F.2080809@diamand.org> (raw)


I've been using git-p4 to keep a git branch more-or-less tracking a 
perforce repository.

That works well with one person, but with more people it gets harder.

I'd like to get to the point where the two branches are kept in sync 
pretty much automatically, continually (modulo merge conflicts where the 
same lines are touched in git and p4 simultaneously). Right now I'm 
using "git-p4 rebase" manually.

I'm just wondering if anyone else has done this, and what 
experiences/techniques/problems they have?

Thanks
Luke

                 reply	other threads:[~2011-05-06 21:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=4DC46A8F.2080809@diamand.org \
    --to=luke@diamand.org \
    --cc=git@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).