一、切换到目录
首先切换到要查看的文件所在的目录:
cd
二、git log --pretty
列出git库中所有文件相对上一版本的改动历史
git log --pretty=oneline如:
vichie@vichie-lucia:~/netcast/rk3066/netcast/os/kernel$ git log --pretty=oneline
b6631c3d69fe279ffad682758c734b0bd5923ff6 解决进入系统前HDMI 显示不全的问题
5ab9c88e586ad84287c7253f27ad635349275eca 临时增加判断参数以解决reboot时崩溃的问题
73dadd5bcd305a87d0feb757bbfefe35a7fd798a 去掉开机的企鹅LOGO
f6a17a718f9d20ae5489bf14b4276cd38edc8081 add leds control interface to system
878c5a152de9f4dd78c32cd3b625ae065764d236 add LEDs blink interface to system
e3a2e647ec54679dafcf610802e22e4836603859 增加双色LED的控制,进入内核后绿灯亮
d634e26328df7b6e8445806049289536feb2fe04 Merge "add hw infomation interface" into ff-netcast-8610-dev
755640431a8348a78449d68643f4f14a4b8b6a78 add hw infomation interface
b4a35f869f64e6d334113cb98fc14f5d3b25d9d8 Merge "add system id support interface" into ff-netcast-8610-de
dda13fa19965aa240a44a335b22f200510b2d461 ljm fix hw cursor scale wrong problem
ce4214fdff325fb3f9a4a92a9d5de2a4613591f6 add system id support interface
6bcd8776eb9d98f66c4931006b1b1c153be668bc change file format from dos format to unix format.
db2d8d2b8151f540a093a5cf1e4861b5c2ee8e4e Merge "[000010] netcast : kernel : add unused file Android.mk"
26e9310113a0906a35514b0aa389e2c1904aa6e2 [000010] netcast : kernel : add unused file Android.mk
0606c699ba3a677ff1eab710678629e0a3e378a1 Disable CEC debug logs.
481f39429154437e621e190a833dfda5925cac98 One touch play is OK. Switch HDMI is OK.
eb9b0a96b18530311b44b37a8ca79e7f19e3b91b [000009] netcast : kernel : add config for supporting AP6181
598a55f327c9d480f75b224d1f296075096211cd ljm make mrpoper in kernel rm include/config include/generated
d7665affbcec4cd6fb6b26ceccad86b410f46acf [000008] netcast : kernel : modification for auto compiling ker
263536ed0f38c95225a81ae54ab1363b2c5248dd [000007] netcast : kernel : add AndroidKernel.mk
a1877a443b74c5158263902c252df65961d18836 Enable hdmi CEC function.
50a286af0854c34469f5e959bc28218e816664aa ljm change default config to 1080p
8cf4766932e60dc4b2a5e3296a4bffe884b5af50 Merge "ljm update fb driver to date" into ff-netcast-8610-dev
c9e6deed2d6be6131d841e338d0ef40647712829 ljm update fb driver to date
2cae552f797c7912542b98d3a397383440f7e7e2 ljm change usb to device, can use adb by default
201b443bae10908b7798cf6eadcbfe9e8fd9a503 ljm update kernel graphics and hdmi audio to date
9ffaf29839caac577545b575fcad0d6fa47941e1 [000006] netcast : kernel : compile error
b5abb6b571b01b5460b52dba53486ed21d3369d7 [000003] netcast : kernel/arch/arm/plat-rk/Kconfig : disable V
ca9ed48e785297fec7a5d839b19b20a44f7e72a3 [000002] netcast : kernel : upgrade expect driver/video and sou
5c3cd57ab3df27952a7bc5e0421d5d887769795f [000001] netcast : kernel : uncomments 4.6 compiler
cda44455038c627e1e3f5d5c7f63eb3feeca1310 add prebuilt kernel should make kernel first, or put your kerne
4863001272d24a3eeaad027b478798b72ae44d91 basic config to usb host or usb device
4eca4782a24dec2dc7d5b9192b3c32f5766c98dc [000000] netcast : kernel : init commit
ac3e9466e4892ddedbef85cbdbb5a9b0fe75c453 Initial empty repository
然后使用下面的命令可列出某一文件的相对上一版本的所有改动历史,注意,这里着眼于具体的一个文件,而不是git库
git log --pretty=oneline 文件名
如:
vichie@vichie-lucia:~/netcast/rk3066/netcast/os/kernel/arch/arm/configs$ git log --pretty=oneline rk30_hotdog_defconfig 73dadd5bcd305a87d0feb757bbfefe35a7fd798a 去掉开机的企鹅LOGO eb9b0a96b18530311b44b37a8ca79e7f19e3b91b [000009] netcast : kernel : add config for supporting AP6181 a1877a443b74c5158263902c252df65961d18836 Enable hdmi CEC function. 50a286af0854c34469f5e959bc28218e816664aa ljm change default config to 1080p 2cae552f797c7912542b98d3a397383440f7e7e2 ljm change usb to device, can use adb by default ca9ed48e785297fec7a5d839b19b20a44f7e72a3 [000002] netcast : kernel : upgrade expect driver/video and sou 4eca4782a24dec2dc7d5b9192b3c32f5766c98dc [000000] netcast : kernel : init commit
三、git show
如上所示,打印出来的就是针对文件rk30_hotdog_defconfig的所有的改动历史,每一行最前面的那一长串数字就是每次提交形成的哈希值,接下来使用git show即可显示具体的某次的改动的修改~
git show 73dadd5bcd305a87d0feb757bbfefe35a7fd798a
结果如下:
commit 73dadd5bcd305a87d0feb757bbfefe35a7fd798a Author: author <author@mail.com> Date: Fri Mar 14 11:53:29 2014 +0800 去掉开机的企鹅LOGO Change-Id: If88322a8f45ac37a3c5adc99f01df07ca6929a53 diff --git a/arch/arm/configs/rk30_hotdog_defconfig b/arch/arm/configs/rk30_hotdog_defconfig index b14515d..99a605a 100755 --- a/arch/arm/configs/rk30_hotdog_defconfig +++ b/arch/arm/configs/rk30_hotdog_defconfig @@ -297,7 +297,7 @@ CONFIG_RK_HDMI=y CONFIG_HDMI_RK30=y CONFIG_RK_HDMI_GPIO_CEC=y CONFIG_RGA_RK30=y -CONFIG_LOGO=y +#CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_SOUND=y + + 列出具体的改动 - -
这样就可以知道是谁做了修改,以及具体的修改代码~
那接下来不管是直接去找他交流还是研究代码,都有依据了~
四、git log -p
查看某一个文件的所有历史版本的详细提交记录,以及都曾经都修改过那些地方
git log -p 文件名
或者 git log -p 哈希值
如:
vichie@vichie-lucia:~/netcast/rk3066/netcast/os/kernel/arch/arm/configs$ git log -p rk30_hotdog_defconfig
commit 73dadd5bcd305a87d0feb757bbfefe35a7fd798a
Author: author <author@mail.com>
Date: Fri Mar 14 11:53:29 2014 +0800
去掉开机的企鹅LOGO
Change-Id: If88322a8f45ac37a3c5adc99f01df07ca6929a53
diff --git a/arch/arm/configs/rk30_hotdog_defconfig b/arch/arm/configs/rk30_hotdog_defconfig
index b14515d..99a605a 100755
--- a/arch/arm/configs/rk30_hotdog_defconfig
+++ b/arch/arm/configs/rk30_hotdog_defconfig
@@ -297,7 +297,7 @@ CONFIG_RK_HDMI=y
CONFIG_HDMI_RK30=y
CONFIG_RK_HDMI_GPIO_CEC=y
CONFIG_RGA_RK30=y
-CONFIG_LOGO=y
+#CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_SOUND=y
commit eb9b0a96b18530311b44b37a8ca79e7f19e3b91b
Author: author <author@mail.com>
Date: Mon Jan 20 11:26:49 2014 +0800
[000009] netcast : kernel : add config for supporting AP6181
修改: arch/arm/configs/rk30_hotdog_defconfig
Change-Id: I428e77fbdf03abd3621eaa6f49d355343a3648e1
diff --git a/arch/arm/configs/rk30_hotdog_defconfig b/arch/arm/configs/rk30_hotdog_defconfig
index cebb076..b14515d 100755
--- a/arch/arm/configs/rk30_hotdog_defconfig
+++ b/arch/arm/configs/rk30_hotdog_defconfig
@@ -209,7 +209,10 @@ CONFIG_PHYLIB=y
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_WLAN_80211=y
-CONFIG_RTL8188EU=y
+# CONFIG_RTL8188EU is not set
+CONFIG_RKWIFI=y
+CONFIG_RK_CFG80211=y
+CONFIG_AP6181=y
CONFIG_USB_USBNET=y
CONFIG_PPP=y
CONFIG_PPP_MULTILINK=y
commit a1877a443b74c5158263902c252df65961d18836
Author: author <author@mail.com>
Date: Wed Jan 15 11:17:09 2014 +0800
Enable hdmi CEC function.
See drivers/video/rockchip/hdmi/softcec for more details.
Change-Id: Ie53585069ca76acfa541eb62a1f14c52dd48d4ad
diff --git a/arch/arm/configs/rk30_hotdog_defconfig b/arch/arm/configs/rk30_hotdog_defconfig
index 1e217e4..cebb076 100755
--- a/arch/arm/configs/rk30_hotdog_defconfig
+++ b/arch/arm/configs/rk30_hotdog_defconfig
@@ -292,6 +292,7 @@ CONFIG_LCDC_RK30=y
# CONFIG_LCDC1_RK30 is not set
CONFIG_RK_HDMI=y
CONFIG_HDMI_RK30=y
+CONFIG_RK_HDMI_GPIO_CEC=y
CONFIG_RGA_RK30=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
commit 50a286af0854c34469f5e959bc28218e816664aa
Author: author <author@mail.com>
Date: Tue Jan 14 01:52:30 2014 -0500
ljm change default config to 1080p
modified: rk30_hotdog_defconfig
Change-Id: I423b1a9078219ab6f39add01a27bb809d86160a3
diff --git a/arch/arm/configs/rk30_hotdog_defconfig b/arch/arm/configs/rk30_hotdog_defconfig
index 9612763..1e217e4 100755
--- a/arch/arm/configs/rk30_hotdog_defconfig
+++ b/arch/arm/configs/rk30_hotdog_defconfig
@@ -286,7 +286,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_DISPLAY_SUPPORT=y
-CONFIG_BOX_FB_720P=y
+CONFIG_BOX_FB_1080P=y
CONFIG_FB_ROCKCHIP=y
CONFIG_LCDC_RK30=y
# CONFIG_LCDC1_RK30 is not set
commit 2cae552f797c7912542b98d3a397383440f7e7e2
Author: author <author@mail.com>
Date: Fri Jan 10 01:04:27 2014 -0500
ljm change usb to device, can use adb by default
modified: rk30_hotdog_defconfig
Change-Id: Ica46fdbb5623a21cf638f0fcf1096b4b6e24eebd
diff --git a/arch/arm/configs/rk30_hotdog_defconfig b/arch/arm/configs/rk30_hotdog_defconfig
index 4797b25..9612763 100755
--- a/arch/arm/configs/rk30_hotdog_defconfig
+++ b/arch/arm/configs/rk30_hotdog_defconfig
@@ -376,7 +376,7 @@ CONFIG_USB_GADGET=y
CONFIG_USB20_HOST=y
CONFIG_USB20_OTG=y
CONFIG_DWC_OTG_BOTH_HOST_SLAVE=y
-CONFIG_DWC_OTG_DEFAULT_HOST=y
+CONFIG_DWC_OTG_DEFAULT_DEVICE=y
CONFIG_DWC_REMOTE_WAKEUP=y
CONFIG_MMC=y
CONFIG_MMC_UNSAFE_RESUME=y
五、git blame
显示文件的每一行是在那个版本最后修改
git blame 文件名
如:
vichie@vichie-lucia:~/netcast/rk3066/netcast/os/kernel/arch/arm/configs$ git blame rk30_hotdog_defconfig
4eca4782 (Author 2013-12-30 17:33:16 +0800 1) CONFIG_EXPERIMENTAL=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 2) # CONFIG_LOCALVERSION_AUTO is not set
4eca4782 (Author 2013-12-30 17:33:16 +0800 3) CONFIG_KERNEL_LZO=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 4) CONFIG_LOG_BUF_SHIFT=19
4eca4782 (Author 2013-12-30 17:33:16 +0800 5) CONFIG_CGROUPS=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 6) CONFIG_CGROUP_DEBUG=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 7) CONFIG_CGROUP_FREEZER=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 8) CONFIG_CGROUP_CPUACCT=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 9) CONFIG_RESOURCE_COUNTERS=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 10) CONFIG_CGROUP_SCHED=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 11) CONFIG_RT_GROUP_SCHED=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 12) CONFIG_BLK_DEV_INITRD=y
4eca4782 (Author 2013-12-30 17:33:16 +0800 13) CONFIG_PANIC_TIMEOUT=1
4eca4782 (Author 2013-12-30 17:33:16 +0800 14) # CONFIG_SYSCTL_SYSCALL is not set
4eca4782 (Author 2013-12-30 17:33:16 +0800 15) # CONFIG_ELF_CORE is not set
六、git whatchanged
git whatchanged 文件名
显示某个文件的每个版本提交信息:提交日期,提交人员,版本号,提交备注(没有修改细节)
如:
vichie@vichie-lucia:~/netcast/rk3066/netcast/os/kernel/arch/arm/configs$ git whatchanged rk30_hotdog_defconfig
commit 73dadd5bcd305a87d0feb757bbfefe35a7fd798a
Author: author <author@mail.com>
Date: Fri Mar 14 11:53:29 2014 +0800
去掉开机的企鹅LOGO
Change-Id: If88322a8f45ac37a3c5adc99f01df07ca6929a53
:100755 100755 b14515d... 99a605a... M arch/arm/configs/rk30_hotdog_defconfig
commit eb9b0a96b18530311b44b37a8ca79e7f19e3b91b
Author: author <author@mail.com>
Date: Mon Jan 20 11:26:49 2014 +0800
[000009] netcast : kernel : add config for supporting AP6181
修改: arch/arm/configs/rk30_hotdog_defconfig
Change-Id: I428e77fbdf03abd3621eaa6f49d355343a3648e1
:100755 100755 cebb076... b14515d... M arch/arm/configs/rk30_hotdog_defconfig
commit a1877a443b74c5158263902c252df65961d18836
Author: author <author@mail.com>
Date: Wed Jan 15 11:17:09 2014 +0800
Enable hdmi CEC function.
See drivers/video/rockchip/hdmi/softcec for more details.
Change-Id: Ie53585069ca76acfa541eb62a1f14c52dd48d4ad
:100755 100755 1e217e4... cebb076... M arch/arm/configs/rk30_hotdog_defconfig
commit 50a286af0854c34469f5e959bc28218e816664aa
Author: author <author@mail.com>
Date: Tue Jan 14 01:52:30 2014 -0500
http://git-scm.com/book/zh/%E8%B5%B7%E6%AD%A5