git am提交报错

在打patch的时候,执行git am命令之后,我觉得patch太多了,我作死用了git am *.patch,打算一下将所有的patch都打上,然后就报错了

Applying: disable otg u disk
error: patch failed: huaqin/hq8735_6ttb_b2b_m/za6604_wifionly/default/bsp/kernel/hq8735_6ttb_b2b_m_debug_defconfig:194
error: huaqin/hq8735_6ttb_b2b_m/za6604_wifionly/default/bsp/kernel/hq8735_6ttb_b2b_m_debug_defconfig: patch does not apply
error: patch failed: huaqin/hq8735_6ttb_b2b_m/za6604_wifionly/default/bsp/kernel/hq8735_6ttb_b2b_m_defconfig:185
error: huaqin/hq8735_6ttb_b2b_m/za6604_wifionly/default/bsp/kernel/hq8735_6ttb_b2b_m_defconfig: patch does not apply
error: patch failed: kernel-3.18/arch/arm64/configs/hq8735_6ttb_b2b_m_debug_defconfig:193
error: kernel-3.18/arch/arm64/configs/hq8735_6ttb_b2b_m_debug_defconfig: patch does not apply
error: patch failed: kernel-3.18/arch/arm64/configs/hq8735_6ttb_b2b_m_defconfig:184
error: kernel-3.18/arch/arm64/configs/hq8735_6ttb_b2b_m_defconfig: patch does not apply
error: patch failed: kernel-3.18/drivers/power/mediatek/battery_common.c:403
error: kernel-3.18/drivers/power/mediatek/battery_common.c: patch does not apply
Patch failed at 0001 disable otg u disk
The copy of the patch that failed is found in:
   /home2/fenglei3/X70/X70-dongyayinhang-modify/TB3-X70/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

 看到报错,我就失望了,还是一条一条打吧,但是接着执行git am xxx.patch的时候又报错了~

previous rebase directory /home2/fenglei3/X70/X70-dongyayinhang-modify/TB3-X70/.git/rebase-apply still exists but mbox given.

解决方案:

git am --abort