From: Torsten Bögershausen <tboegi@web.de>
Date: Thu, 07 Jun 2012 17:57:10 GMT
Subject: Re: rebase [-i --exec | -ix] <CMD>...
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".