From: Kent Borg <kentborg@borg.org>
To: Tor Arvid Lund <torarvid@gmail.com>
Cc: git@vger.kernel.org, "Alejandro Riveira Fernández" <ariveira@gmail.com>
Subject: Re: git-p4
Date: Sun, 12 Sep 2010 16:07:31 -0400 [thread overview]
Message-ID: <4C8D3303.1030302@borg.org> (raw)
In-Reply-To: <AANLkTi=NGsY3wDiTLwNLpw4TJMpiSY8A=az_=v2fYDLj@mail.gmail.com>
Tor Arvid Lund wrote:
> When messing about with git-p4 I have sometimes messed up that
> p4/master ref myself. I can normally fix it by setting it manually
Um, I maybe just did that before I saw your e-mail.
I edited:
.git/info/refs
.git/ORIG_HEAD
.git/packed/refs
...and put in the sha1 of the "[git-p4:"-commit.
When I now do:
$ git rev-list --no-merges remotes/p4/master..master
I get just the one commit that I hoped to get!
...did I just fix it?
I don't have time to try the "git p4 submit" now, I am going to be late
in meeting my wife. Tomorrow morning...will it work?
Thanks so very much for your help,
-kb
next prev parent reply other threads:[~2010-09-12 20:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-10 19:54 git-p4 Kent Borg
2010-09-10 21:53 ` git-p4 Alejandro Riveira Fernández
2010-09-11 18:42 ` git-p4 Tor Arvid Lund
2010-09-12 15:30 ` git-p4 Kent Borg
2010-09-12 17:22 ` git-p4 Tor Arvid Lund
2010-09-12 17:59 ` git-p4 Kent Borg
2010-09-12 19:54 ` git-p4 Tor Arvid Lund
2010-09-12 20:07 ` Kent Borg [this message]
2010-09-12 20:12 ` git-p4 Tor Arvid Lund
2010-09-13 14:23 ` git-p4 Kent Borg
2010-09-13 15:01 ` git-p4 Tor Arvid Lund
2010-09-13 16:28 ` git-p4 Kent Borg
2010-09-13 21:58 ` git-p4 Tor Arvid Lund
2010-09-16 12:14 ` git-p4 Kent Borg
2010-09-16 13:54 ` git-p4 Tor Arvid Lund
-- strict thread matches above, loose matches on Subject: below --
2008-09-07 13:17 git-p4 dhruva
2008-09-07 13:17 git-p4 dhruva
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=4C8D3303.1030302@borg.org \
--to=kentborg@borg.org \
--cc=ariveira@gmail.com \
--cc=git@vger.kernel.org \
--cc=torarvid@gmail.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.