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

Re: rebase [-i --exec | -ix] <CMD>...

From
Torsten Bögershausen <tboegi@web.de>
Date
Jun 7, 2012, 17:57 UTC
Message-ID
<4FD0EB76.90501@web.de>
In-Reply-To
<1339087582-10040-1-git-send-email-Lucien.Kong@ensimag.imag.fr>

Still no success :-( Please see below:

git checkout a63d7ed3017e312ddc752ac89a7d292 tb@birne:~/projects/git/git.git> git am --abort ; git am < 1339089425.H311811P3927.appes.lan\:2\,S

Applying: rebase [-i --exec | -ix] <CMD>...
error: patch failed: Documentation/git-rebase.txt:8
error: Documentation/git-rebase.txt: patch does not apply
error: patch failed: git-rebase--interactive.sh:684
error: git-rebase--interactive.sh: patch does not apply
error: patch failed: git-rebase.sh:3
error: git-rebase.sh: patch does not apply
error: patch failed: t/t3404-rebase-interactive.sh:755
error: t/t3404-rebase-interactive.sh: patch does not apply
Patch failed at 0001 rebase [-i --exec | -ix] <CMD>...
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Previous: Lucien KongNext: konglu@minatec.inpg.fr
Message 6 of 15 in “commit a63d7ed3017e312ddc752ac89a7d292a745d5f11 broken on MacOS”
  1. Torsten BögershausenJun 7, 2012
  2. konglu@minatec.inpg.frJun 7, 2012
  3. Torsten BögershausenJun 7, 2012
  4. konglu@minatec.inpg.frJun 7, 2012
  5. rebase [-i --exec | -ix] <CMD>...Lucien Kong, Jun 7, 2012
  6. Torsten BögershausenJun 7, 2012
  7. konglu@minatec.inpg.frJun 7, 2012
  8. Torsten BögershausenJun 7, 2012
  9. konglu@minatec.inpg.frJun 7, 2012
  10. Andreas SchwabJun 7, 2012
  11. konglu@minatec.inpg.frJun 7, 2012
  12. Andreas SchwabJun 7, 2012
  13. Matthieu MoyJun 7, 2012
  14. Johannes SixtJun 7, 2012
  15. Junio C HamanoJun 8, 2012

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.