修改代碼,查看修改的代碼
$ git status
On branch 20190506_xxx_driver
Your branch is up to date with 'origin/20190506_xxx_driver'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: arch/arm/configs/kedacom/h900_2g_defconfig
modified: drivers/char/peri-chip/h900_chip.c
modified: drivers/klsp/h900/bcsr.c
modified: drivers/klsp/h900/board_cfg.c
modified: drivers/klsp/h900/cpld_ctrl.c
modified: drivers/klsp/h900/cpld_ctrl.h
modified: drivers/klsp/h900/cpld_e1.c
modified: drivers/klsp/include/bcsr_common.h
modified: kernel/timeconst.pl
modified: pifm/Kconfig
modified: pifm/Makefile
modified: pifm/pifcfg/pif_tty.c
modified: pifm/pifdrv/Kconfig
modified: pifm/pifdrv/Makefile
modified: pifm/pifdrv/boards/h900/cn847x_setup.c
modified: pifm/pifdrv/boards/h900/e1phy_setup.c
modified: pifm/pifdrv/cn847x_mscc/cn847x.c
將修改的代碼，生成patch包
git diff > h900.patch在另一側，合并patch包
$ git apply h900.patch
$ git status
On branch 20190506_xxx_driver
Your branch is up to date with 'origin/20190506_xxx_driver'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: arch/arm/configs/kedacom/h900_2g_defconfig
modified: drivers/char/peri-chip/h900_chip.c
modified: drivers/klsp/h900/bcsr.c
modified: drivers/klsp/h900/board_cfg.c
modified: drivers/klsp/h900/cpld_ctrl.c
modified: drivers/klsp/h900/cpld_ctrl.h
modified: drivers/klsp/h900/cpld_e1.c
modified: drivers/klsp/include/bcsr_common.h
modified: kernel/timeconst.pl
modified: pifm/Kconfig
modified: pifm/Makefile
modified: pifm/pifcfg/pif_tty.c
modified: pifm/pifdrv/Kconfig
modified: pifm/pifdrv/Makefile
modified: pifm/pifdrv/boards/h900/cn847x_setup.c
modified: pifm/pifdrv/boards/h900/e1phy_setup.c
modified: pifm/pifdrv/cn847x_mscc/cn847x.c
轉載請註明出處，本文鏈接：https://www.uj5u.com/qita/246096.html
標籤：其他
上一篇：橫板闖關游戲中的角色移動
下一篇：絕對素數