On Friday 06 July 2012 16:32:13 Togan Muftuoglu wrote: > On 07/06/2012 06:12 PM, Christopher Roy Bratusek wrote: > > What versions of librep & co are you using? 'cause none of your patches > > does apply with 'git am'... > > > > Chris > > this the git from git://git.tuxfamily.org/gitroot/librep/main.git > with the latest commit being 98019ece3ac52fc14b4d590f108e3f8d879ac007 > > ps did you try it with git am -i -3 to see why it does not > > Togan
Result attached maybe my mail-client messes things up? I guess it's worth a try posting patches as attachment. Regards
Commit Body is: -------------------------- Signed-off-by: Togan Muftuoglu <[email protected]> -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all Applying: Signed-off-by: Togan Muftuoglu <[email protected]> Using index info to reconstruct a base tree... Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001 Signed-off-by: Togan Muftuoglu <[email protected]> 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".
signature.asc
Description: This is a digitally signed message part.
