From: "Torsten Bögershausen" <tboegi@web.de>
To: Lucien Kong <Lucien.Kong@ensimag.imag.fr>
Cc: tboegi@web.de, git@vger.kernel.org
Subject: Re: rebase [-i --exec | -ix] <CMD>...
Date: Thu, 07 Jun 2012 19:57:10 +0200 [thread overview]
Message-ID: <4FD0EB76.90501@web.de> (raw)
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".
next prev parent reply other threads:[~2012-06-07 17:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-07 11:53 commit a63d7ed3017e312ddc752ac89a7d292a745d5f11 broken on MacOS Torsten Bögershausen
2012-06-07 14:20 ` konglu
2012-06-07 16:14 ` Torsten Bögershausen
2012-06-07 16:40 ` konglu
2012-06-07 16:46 ` rebase [-i --exec | -ix] <CMD> Lucien Kong
2012-06-07 17:57 ` Torsten Bögershausen [this message]
2012-06-07 18:07 ` konglu
2012-06-07 19:10 ` Torsten Bögershausen
2012-06-07 19:55 ` konglu
2012-06-07 20:35 ` Andreas Schwab
2012-06-07 20:44 ` konglu
2012-06-07 21:12 ` Andreas Schwab
2012-06-07 20:49 ` Matthieu Moy
2012-06-07 20:59 ` Johannes Sixt
2012-06-08 15:34 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FD0EB76.90501@web.de \
--to=tboegi@web.de \
--cc=Lucien.Kong@ensimag.imag.fr \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).