git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git rebase --skip stuck in a loop

From
PSPhillip Susi <psusi@ubuntu.com>
Date
Jun 13, 2014, 14:15 UTC
Message-ID
<539B0795.70907@ubuntu.com>
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:
Show 6 quoted lines
> 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-----

Previous: Jeff KingNext: brian m. carlson
Message 6 of 9 in “git rebase --skip stuck in a loop”
  1. Phillip SusiJun 10, 2014
  2. Phillip SusiJun 12, 2014
  3. brian m. carlsonJun 13, 2014
  4. Phillip SusiJun 13, 2014
  5. Jeff KingJun 13, 2014
  6. Phillip SusiJun 13, 2014
  7. brian m. carlsonJun 15, 2014
  8. rebase--merge: fix --skip with two conflicts in a rowbrian m. carlson, Jun 16, 2014
  9. Junio C HamanoJun 16, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.