多个Patch的合并:
#git log
------------------------------------------------------------------------------
commit b56f73c3dba6fade796b5fba5fdaaba18adecd6f
Author: floyd.peng <floyd.peng@dniserver.dnish.net>
Date: Wed Oct 10 09:51:54 2012 +0800
correct return value of sysread_LanWlanObject_XXX and some other issue
commit 5ff2e69094a6f53f70f29f9e096f44f56cf431cb
Author: floyd.peng <floyd.peng@dniserver.dnish.net>
Date: Mon Oct 8 14:42:22 2012 +0800
resolv.conf issue
commit cfded04cd8fd389b10382ef07fbc23428d207208
Author: floyd.peng <floyd.peng@dniserver.dnish.net>
Date: Mon Oct 8 14:38:22 2012 +0800
connect to the new server , add output logs of caCWMP
--------------------------------------------------------------------------------
合并前两个commit
#git reset --soft cfded04cd8fd389b10382ef07fbc23428d207208
#git commit -m "make two patch into only one patch"
patch的生成
#git format-patch -u -1
这样就完成了两个PATCH的合并。
----------------------------------------------------------------------------------
git reset --hard :退回到某个版本,包括本地文件也回退该版本。
git reset --soft :退回到某个commit,但文件的状态处于index和commit之间的状态--即已添加index但未commit。