上篇博文的终端命令记录，以供查阅

最新推荐文章于 2023-06-06 00:00:24 发布

nicnac

最新推荐文章于 2023-06-06 00:00:24 发布

阅读量3.5k

点赞数

分类专栏： pull merge git branch 文章标签：终端 git android branch hook merge

本文链接：https://blog.csdn.net/nicnac/article/details/7822847

版权

git 同时被 3 个专栏收录

4 篇文章 0 订阅

订阅专栏

pull

2 篇文章 0 订阅

订阅专栏

merge

2 篇文章 0 订阅

订阅专栏

转载请标明出处：http://blog.csdn.net/nicnac/article/details/7822847

Last login: Wed Aug 1 15:32:26 2012 from 192.168.60.102

[zhangyixiang@android ~]$ git log
fatal: Not a git repository (or any of the parent directories): .git
[zhangyixiang@android ~]$ cd git0702/git1106/
[zhangyixiang@android git1106]$ git log
commit 5fb8fa1f61e6039478a638034b5f75633bd830f5
Author: zhangyixiang <zhangyixiang@android.seuic.com>
Date: Wed Aug 1 16:47:07 2012 +0800
添加话柄摘放处理并上报至应用层(CallNotifier.java)

commit 336f0c44fe68581779dab8124b54e5db0d088a12
Author: zhouniandong <dongseu@163.com>
Date: Wed Jun 20 13:14:45 2012 +0800
修改了设备ID，改为SEUIC-M600

commit ef5d7f9d0de9dd8bf2746e22aac59f10393060b8

Author: zhouniandong <dongseu@163.com>
Date: Mon May 28 17:43:13 2012 +0800
提交部分修改，解决编译不过的问题

commit 898aadc006c8d6bd40c8b59c9f67524baa90f149
Author: zhouniandong <zhouniandong@android.seuic.com>
Date: Mon May 28 17:35:56 2012 +0800

[zhangyixiang@android git1106]$ git reset ef5d7f9d0de9dd8bf2746e22aac59f10393060b8（尼玛，选错commit了）
Unstaged changes after reset:
M device/telechips/tcc92xx-common/init.rc
M frameworks/base/libs/audioflinger/AudioPolicyService.cpp
M frameworks/base/telephony/java/android/telephony/TelephonyManager.java
M frameworks/base/telephony/java/com/android/internal/telephony/BaseCommands.java
M frameworks/base/telephony/java/com/android/internal/telephony/CommandsInterface.java
M frameworks/base/telephony/java/com/android/internal/telephony/Phone.java
M frameworks/base/telephony/java/com/android/internal/telephony/PhoneBase.java
M frameworks/base/telephony/java/com/android/internal/telephony/PhoneProxy.java
M frameworks/base/telephony/java/com/android/internal/telephony/PhoneStateIntentReceiver.java
M frameworks/base/telephony/java/com/android/internal/telephony/RIL.java
M frameworks/base/telephony/java/com/android/internal/telephony/RILConstants.java
M frameworks/base/telephony/java/com/android/internal/telephony/ServiceStateTracker.java
M frameworks/base/telephony/java/com/android/internal/telephony/TelephonyIntents.java
M frameworks/base/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
M frameworks/base/telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
M frameworks/base/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
M hardware/ril/include/telephony/ril.h
M hardware/ril/libril/ril.cpp
M hardware/ril/libril/ril_unsol_commands.h
M hardware/ril/reference-ril/atchannel.c
M hardware/ril/reference-ril/reference-ril.c
M kernel/arch/arm/configs/fina_defconfig
M kernel/drivers/char/Kconfig
M kernel/drivers/char/Makefile
M kernel/drivers/usb/dwc_otg/v2.65a/dwc_otg_hcd_intr.c
M kernel/drivers/usb/dwc_otg/v2.65a/dwc_otg_plat.h
M kernel/drivers/usb/dwc_otg/v2.81a/driver/dwc_otg_hcd_intr.c
M packages/apps/Phone/src/com/android/phone/CallNotifier.java
[zhangyixiang@android git1106]$ git commit -am "添加话柄摘放处理并上报至应用层(CallNotifier.java)"
[hook 432802e] 添加话柄摘放处理并上报至应用层(CallNotifier.java)
Committer: zhangyixiang <zhangyixiang@android.seuic.com>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

git config --global user.name "Your Name"
git config --global user.email you@example.com

If the identity used for this commit is wrong, you can fix it with:

git commit --amend --author='Your Name <you@example.com>'

28 files changed, 263 insertions(+), 65 deletions(-)
[zhangyixiang@android git1106]$ git log（尼玛，完了完了，少了一项“修改了设备ID，改为SEUIC-M600”，别急下面解决）
commit 432802ec8f2aa8899dc4eaad08131ba33ca17601
Author: zhangyixiang <zhangyixiang@android.seuic.com>
Date: Wed Aug 1 17:07:35 2012 +0800
添加话柄摘放处理并上报至应用层(CallNotifier.java)

commit ef5d7f9d0de9dd8bf2746e22aac59f10393060b8
Author: zhouniandong <dongseu@163.com>
Date: Mon May 28 17:43:13 2012 +0800
提交部分修改，解决编译不过的问题

[zhangyixiang@android git1106]$ git checkout RIL
Switched to branch 'RIL'
[zhangyixiang@android git1106]$ git log
commit 336f0c44fe68581779dab8124b54e5db0d088a12
Author: zhouniandong <dongseu@163.com>
Date: Wed Jun 20 13:14:45 2012 +0800
修改了设备ID，改为SEUIC-M600

commit ef5d7f9d0de9dd8bf2746e22aac59f10393060b8
Author: zhouniandong <dongseu@163.com>
Date: Mon May 28 17:43:13 2012 +0800

提交部分修改，解决编译不过的问题

[zhangyixiang@android git1106]$ git branch hook_ok
[zhangyixiang@android git1106]$ git checkout hook_ok
Switched to branch 'hook_ok'
[zhangyixiang@android git1106]$ git add -A
[zhangyixiang@android git1106]$ git branch
RIL
develop
hook
* hook_ok
[zhangyixiang@android git1106]$ git commit -am "添加话柄摘放处理并上报至应用层(CallNotifier.java)"
# On branch hook_ok
nothing to commit (working directory clean)(此一别，永不相逢，参看上一篇，你懂得~~)
[zhangyixiang@android git1106]$ git log
commit 336f0c44fe68581779dab8124b54e5db0d088a12
Author: zhouniandong <dongseu@163.com>
Date: Wed Jun 20 13:14:45 2012 +0800
修改了设备ID，改为SEUIC-M600

commit ef5d7f9d0de9dd8bf2746e22aac59f10393060b8
Author: zhouniandong <dongseu@163.com>
Date: Mon May 28 17:43:13 2012 +0800
提交部分修改，解决编译不过的问题

commit 898aadc006c8d6bd40c8b59c9f67524baa90f149
Author: zhouniandong <zhouniandong@android.seuic.com>
Date: Mon May 28 17:35:56 2012 +0800

Last login: Wed Aug 1 15:55:01 2012 from 192.168.60.102

[zhangyixiang@android git1106]$ git branch
* RIL
develop
hook
hook_ok
[zhangyixiang@android git1106]$ git merge -m "Merge from hook" hook

*** Please tell me who you are.

Run

git config --global user.email "you@example.com"
git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident <zhangyixiang@android.seuic.com> not allowed
[zhangyixiang@android git1106]$ git merge --help
[zhangyixiang@android git1106]$ git pull --help
[zhangyixiang@android git1106]$ git branch test
[zhangyixiang@android git1106]$ git branch
* RIL
develop
hook
hook_ok
test
[zhangyixiang@android git1106]$ git checkout test
Switched to branch 'test'
[zhangyixiang@android git1106]$ git pull . hook
From .
* branch hook -> FETCH_HEAD

*** Please tell me who you are.

Run

git config --global user.email "you@example.com"
git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident <zhangyixiang@android.seuic.com> not allowed
[zhangyixiang@android git1106]$ git config --global user.name "zhangyixiang"
[zhangyixiang@android git1106]$ git pull . hook(将hook分支合并过来)
From .
* branch hook -> FETCH_HEAD
Auto-merging frameworks/base/telephony/java/com/android/internal/telephony/RIL.java
Merge made by recursive.
device/telechips/tcc92xx-common/init.rc | 4 +-
.../base/libs/audioflinger/AudioPolicyService.cpp | 4 +-
.../android/internal/telephony/BaseCommands.java | 11 +-
.../internal/telephony/CommandsInterface.java | 3 +
.../java/com/android/internal/telephony/Phone.java | 8 +-
.../com/android/internal/telephony/PhoneBase.java | 23 +++
.../com/android/internal/telephony/PhoneProxy.java | 9 +
.../telephony/PhoneStateIntentReceiver.java | 17 ++
.../java/com/android/internal/telephony/RIL.java | 19 ++-
.../android/internal/telephony/RILConstants.java | 1 +
.../internal/telephony/ServiceStateTracker.java | 5 +-
.../internal/telephony/TelephonyIntents.java | 1 +
.../android/internal/telephony/cdma/CDMAPhone.java | 12 ++
.../internal/telephony/cdma/CdmaCallTracker.java | 3 +-
.../telephony/cdma/CdmaServiceStateTracker.java | 13 ++-
hardware/ril/include/telephony/ril.h | 14 ++
hardware/ril/libril/ril.cpp | 3 +-
hardware/ril/libril/ril_unsol_commands.h | 5 +-
hardware/ril/reference-ril/atchannel.c | 71 +++++++-
hardware/ril/reference-ril/reference-ril.c | 10 +-
kernel/arch/arm/configs/fina_defconfig | 2 +
kernel/drivers/char/Kconfig | 6 +
kernel/drivers/char/Makefile | 2 +-
kernel/drivers/char/hook_gpio.c | 184 ++++++++++++++++++++
.../drivers/usb/dwc_otg/v2.65a/dwc_otg_hcd_intr.c | 24 ++--
kernel/drivers/usb/dwc_otg/v2.65a/dwc_otg_plat.h | 4 +-
.../usb/dwc_otg/v2.81a/driver/dwc_otg_hcd_intr.c | 30 ++--
.../Phone/src/com/android/phone/CallNotifier.java | 21 ++-
28 files changed, 445 insertions(+), 64 deletions(-)
create mode 100644 kernel/drivers/char/hook_gpio.c
[zhangyixiang@android git1106]$ git log("修改了设备ID，改为SEUIC-M600"这一版回来了，呼呼，不容易哈~)
commit e71726a3f2d27cc2ad67b35765f00d51dede8b4e
Merge: 336f0c4 08cb4ea
Author: zhangyixiang <zhangyixiang@android.seuic.com>
Date: Wed Aug 1 18:03:17 2012 +0800
Merge branch 'hook' into test

commit 08cb4ea3f0dfa503146598f55801c329fac8bafe
Author: zhangyixiang <zhangyixiang@android.seuic.com>
Date: Wed Aug 1 17:12:11 2012 +0800
添加话柄摘放处理并上报至应用层(CallNotifier.java)

commit 336f0c44fe68581779dab8124b54e5db0d088a12
Author: zhouniandong <dongseu@163.com>
Date: Wed Jun 20 13:14:45 2012 +0800
修改了设备ID，改为SEUIC-M600

commit ef5d7f9d0de9dd8bf2746e22aac59f10393060b8
Author: zhouniandong <dongseu@163.com>
Date: Mon May 28 17:43:13 2012 +0800
提交部分修改，解决编译不过的问题

[zhangyixiang@android git1106]$ git branch
RIL
develop
hook
hook_ok
* test
[zhangyixiang@android git1106]$ git checkout RIL
Switched to branch 'RIL'
[zhangyixiang@android git1106]$ git log(此一别，永不相逢，参看上一篇，你懂得~~)
commit 336f0c44fe68581779dab8124b54e5db0d088a12
Author: zhouniandong <dongseu@163.com>
Date: Wed Jun 20 13:14:45 2012 +0800
修改了设备ID，改为SEUIC-M600

commit ef5d7f9d0de9dd8bf2746e22aac59f10393060b8
Author: zhouniandong <dongseu@163.com>
Date: Mon May 28 17:43:13 2012 +0800
提交部分修改，解决编译不过的问题

[zhangyixiang@android git1106]$ pwd
/home/zhangyixiang/git0702/git1106
[zhangyixiang@android git1106]$ git branch
RIL
develop
* hook
hook_ok
test

Last login: Wed Aug 1 17:21:59 2012 from 192.168.60.102
[luyuhong@android git1106]$ git log
commit 336f0c44fe68581779dab8124b54e5db0d088a12
Author: zhouniandong <dongseu@163.com>
Date: Wed Jun 20 13:14:45 2012 +0800
修改了设备ID，改为SEUIC-M600

commit ef5d7f9d0de9dd8bf2746e22aac59f10393060b8
Author: zhouniandong <dongseu@163.com>
Date: Mon May 28 17:43:13 2012 +0800
提交部分修改，解决编译不过的问题

[luyuhong@android git1106]$ git branch hook1
[luyuhong@android git1106]$ git checkout hook1
M packages/apps/Contacts/res/layout-finger/twelve_key_dialer.xml
M packages/apps/Contacts/res/layout-finger/voicemail_dial_delete.xml
M packages/apps/Contacts/res/layout-land-finger/twelve_key_dialer.xml
M packages/apps/Contacts/res/layout-long-finger/twelve_key_dialer.xml
M packages/apps/Contacts/res/layout-long-finger/voicemail_dial_delete.xml
M packages/apps/Contacts/res/layout-long-land-finger/twelve_key_dialer.xml
M packages/apps/Contacts/src/com/android/contacts/TwelveKeyDialer.java
M packages/apps/Phone/AndroidManifest.xml
M packages/apps/Phone/res/drawable-hdpi/ic_jog_dial_voice_search.png
M packages/apps/Phone/res/layout/incall_screen.xml
M packages/apps/Phone/res/values-zh-rCN/strings.xml
M packages/apps/Phone/res/values/strings.xml
M packages/apps/Phone/res/xml/call_feature_setting.xml
M packages/apps/Phone/res/xml/gsm_umts_options.xml
M packages/apps/Phone/src/com/android/phone/CallForwardEditPreference.java
M packages/apps/Phone/src/com/android/phone/InCallMenu.java
M packages/apps/Phone/src/com/android/phone/InCallMenuView.java
M packages/apps/Phone/src/com/android/phone/InCallScreen.java
M packages/apps/Phone/src/com/android/phone/InCallScreenShowActivation.java
M packages/apps/Settings/res/xml/settings.xml
M packages/apps/Settings/src/com/android/settings/Settings.java
Switched to branch 'hook1'
[luyuhong@android git1106]$ git add -A
[luyuhong@android git1106]$ git commit -a
[hook1 7a878f3] 完善Dail,InCallScreen界面，并添加通话设置
Committer: luyuhong <luyuhong@android.seuic.com>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

git config --global user.name "Your Name"
git config --global user.email you@example.com

If the identity used for this commit is wrong, you can fix it with:

git commit --amend --author='Your Name <you@example.com>'

23 files changed, 735 insertions(+), 77 deletions(-)
mode change 100755 => 100644 packages/apps/Phone/res/drawable-hdpi/ic_jog_dial_voice_search.png
create mode 100644 packages/apps/Phone/res/drawable-hdpi/ic_menu_add.png
create mode 100644 packages/apps/Phone/res/layout/clock.xml
mode change 100755 => 100644 packages/apps/Phone/res/values-zh-rCN/strings.xml
[luyuhong@android git1106]$ git log
commit 7a878f3a7a259367c577eebe492c3456e70ed9fe
Author: luyuhong <luyuhong@android.seuic.com>
Date: Wed Aug 1 18:18:43 2012 +0800

完善Dail,InCallScreen界面，并添加通话设置

commit 336f0c44fe68581779dab8124b54e5db0d088a12
Author: zhouniandong <dongseu@163.com>
Date: Wed Jun 20 13:14:45 2012 +0800

修改了设备ID，改为SEUIC-M600

commit ef5d7f9d0de9dd8bf2746e22aac59f10393060b8
Author: zhouniandong <dongseu@163.com>
Date: Mon May 28 17:43:13 2012 +0800

提交部分修改，解决编译不过的问题

[luyuhong@android git1106]$ git branch
develop_v1
* hook1
[luyuhong@android git1106]$ git pull /home/zhangyixiang/git0702/git1106(尼玛什么情况，怎么出错了！)
fatal: '/home/zhangyixiang/git0702/git1106' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
[luyuhong@android git1106]$ su(切换为root之后尽然好了...好吧，亲...)
Password:
[root@android git1106]# pwd
/home/luyuhong/git1106
[root@android git1106]# git pull /home/zhangyixiang/git0702/git1106
remote: Counting objects: 143, done.
remote: Compressing objects: 100% (62/62), done.
remote: Total 69 (delta 49), reused 0 (delta 0)
Unpacking objects: 100% (69/69), done.
From /home/zhangyixiang/git0702/git1106
* branch HEAD -> FETCH_HEAD
Merge made by recursive.
device/telechips/tcc92xx-common/init.rc | 4 +-
.../base/libs/audioflinger/AudioPolicyService.cpp | 4 +-
.../android/internal/telephony/BaseCommands.java | 11 +-
.../internal/telephony/CommandsInterface.java | 3 +
.../java/com/android/internal/telephony/Phone.java | 8 +-
.../com/android/internal/telephony/PhoneBase.java | 23 +++
.../com/android/internal/telephony/PhoneProxy.java | 9 +
.../telephony/PhoneStateIntentReceiver.java | 17 ++
.../java/com/android/internal/telephony/RIL.java | 19 ++-
.../android/internal/telephony/RILConstants.java | 1 +
.../internal/telephony/ServiceStateTracker.java | 5 +-
.../internal/telephony/TelephonyIntents.java | 1 +
.../android/internal/telephony/cdma/CDMAPhone.java | 12 ++
.../internal/telephony/cdma/CdmaCallTracker.java | 3 +-
.../telephony/cdma/CdmaServiceStateTracker.java | 13 ++-
hardware/ril/include/telephony/ril.h | 14 ++
hardware/ril/libril/ril.cpp | 3 +-
hardware/ril/libril/ril_unsol_commands.h | 5 +-
hardware/ril/reference-ril/atchannel.c | 71 +++++++-
hardware/ril/reference-ril/reference-ril.c | 10 +-
kernel/arch/arm/configs/fina_defconfig | 2 +
kernel/drivers/char/Kconfig | 6 +
kernel/drivers/char/Makefile | 2 +-
kernel/drivers/char/hook_gpio.c | 184 ++++++++++++++++++++
.../drivers/usb/dwc_otg/v2.65a/dwc_otg_hcd_intr.c | 24 ++--
kernel/drivers/usb/dwc_otg/v2.65a/dwc_otg_plat.h | 4 +-
.../usb/dwc_otg/v2.81a/driver/dwc_otg_hcd_intr.c | 30 ++--
.../Phone/src/com/android/phone/CallNotifier.java | 21 ++-
28 files changed, 445 insertions(+), 64 deletions(-)
create mode 100644 kernel/drivers/char/hook_gpio.c
[root@android git1106]# su luyuhong
[luyuhong@android git1106]$ git branch
develop_v1
* hook1
[luyuhong@android git1106]$ git log (神奇的现象要出现了！仔细看，是不是！合并成功了~~~~~~)
commit 57b7240e1a8c5b8dc3a4e8cf030f24489a5d8c1f
Merge: 7a878f3 e71726a
Author: root <root@android.seuic.com>
Date: Wed Aug 1 18:37:35 2012 +0800
Merge /home/zhangyixiang/git0702/git1106 into hook1

commit 7a878f3a7a259367c577eebe492c3456e70ed9fe
Author: luyuhong <luyuhong@android.seuic.com>
Date: Wed Aug 1 18:18:43 2012 +0800
完善Dail,InCallScreen界面，并添加通话设置

commit e71726a3f2d27cc2ad67b35765f00d51dede8b4e
Merge: 336f0c4 08cb4ea
Author: zhangyixiang <zhangyixiang@android.seuic.com>
Date: Wed Aug 1 18:03:17 2012 +0800
Merge branch 'hook' into test

commit 08cb4ea3f0dfa503146598f55801c329fac8bafe
Author: zhangyixiang <zhangyixiang@android.seuic.com>
Date: Wed Aug 1 17:12:11 2012 +0800
添加话柄摘放处理并上报至应用层(CallNotifier.java)

commit 336f0c44fe68581779dab8124b54e5db0d088a12
Author: zhouniandong <dongseu@163.com>
Date: Wed Jun 20 13:14:45 2012 +0800
修改了设备ID，改为SEUIC-M600

commit ef5d7f9d0de9dd8bf2746e22aac59f10393060b8
Author: zhouniandong <dongseu@163.com>
Date: Mon May 28 17:43:13 2012 +0800
提交部分修改，解决编译不过的问题