git am submitting error

When playing patch, after executing git am command, I think too many patch, I seek death by the git am * .patch, going to look at all of the patch are marked, and then on the error

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".

 See the error, I was disappointed, or play it one by one, but then execute git am xxx.patch when they being given a ~

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

solution:

git am --abort

 

Published 65 original articles · won praise 17 · views 50000 +

Guess you like

Origin blog.csdn.net/lancelots/article/details/83178882