From: Phillip Susi <psusi@ubuntu.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: git rebase --skip stuck in a loop
Date: Fri, 13 Jun 2014 10:15:49 -0400 [thread overview]
Message-ID: <539B0795.70907@ubuntu.com> (raw)
In-Reply-To: <20140613073446.GF7908@sigill.intra.peff.net>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 6/13/2014 3:34 AM, Jeff King wrote:
> Thanks for saving the stuck state.
>
> If it's possible to share the whole repo, it might be worth seeing
> (then we can all just run "git rebase --continue" ourselves). If
> it's too big or is confidential, just tarring up .git/rebase-apply
> and making it available is probably a good first step.
It's the debian parted repo, so nothing confidential. Here it is:
https://drive.google.com/file/d/0ByOQJBpP4bDXXy13YlN0aE5Fcnc/edit?usp=sharing
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBAgAGBQJTmweVAAoJEI5FoCIzSKrwI84H/2Di1d5MeQpcg/I02nF7sd/f
gICGclFE8MPuTnKYfpYf4/SbSnB9+Znp+9OhQA0frYIblWHWEnUzwhINrDHvqApK
hCsuNGb5iHgy8ohZVGqH8B4ew8x4Ru3pwy9VYV2Wc1Z33curDIohx6qi4LCIrlaB
StzWgq3h8hV+3QB5zcD9MfAfdKkz1u5bIMlT9VYofYwctYERVk2DyaAj8eKBGyWo
6dWYuZDoQfO3Hnd/uGqWbdHrPiDoSQqYPbHNWNOnX24w+IKDv2Xe9bcHro+9A+Jg
PF+QXo4IS1E7CwevExe7gGKK3KdrD9SMixW7hHAbVVnpDIsvw485EL0xsZfmFJk=
=ncor
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2014-06-13 14:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-10 18:57 git rebase --skip stuck in a loop Phillip Susi
2014-06-12 21:01 ` Phillip Susi
2014-06-13 1:02 ` brian m. carlson
2014-06-13 1:16 ` Phillip Susi
2014-06-13 7:34 ` Jeff King
2014-06-13 14:15 ` Phillip Susi [this message]
2014-06-15 22:39 ` brian m. carlson
2014-06-16 0:01 ` [PATCH] rebase--merge: fix --skip with two conflicts in a row brian m. carlson
2014-06-16 20:31 ` Junio C Hamano
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=539B0795.70907@ubuntu.com \
--to=psusi@ubuntu.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.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 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.