git常用命令

2023-05-16

一、代码提交

/提交代码
git pull //下拉代码并合并到本地
git add . //提交修改(增加或者修改的文件)到本地缓存
git commit -m “备注” //提交修改备注到本地缓存
git push //将修改文件及备注一起提交到远程服务器

附1：

1.报错：git:fatal:Unable to create".git/index.lock"，则删除rm .git/index.lock即可
2.查看修改日志
a)git log //日志-摘要
b)git log --stat //日志-显示提交修改的文件
3.修改本工程的用户名和email（提交的日志将显示自己的用户信息）
git config user.name lilei
git config user.email lilei@163.com
4.修改本用户下的全局的用户名和email
git config --global user.name testuser
git config --global user.email test@163.com

附2

1.比较两次提交修改点
1）.查看提交日志

~# git log --stat 
commit 7f6cb263d550c0ee3fc6f8132db77f22c04b2f5c
Author: xx_liu <xx_liu@didi365.com>
Date:   Mon Aug 1 09:56:43 2022 +0800

    ddlaunch 280

 test/cLauncher | Bin 29185820 -> 38829268 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit dbbafd6b070a7e26ce135d0e013d8cd00e67fcd1
Author: menmen_li <menmen@dotdee.com>
Date:   Fri Jul 29 18:28:39 2022 +0800

    sn code fix

 test/board_r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 ...

2）.查看两次提交的差异
命令：git diff old_commit_id new_commit_id
说明：new_commit_id 比 old_commit_id 提交的内容增加或者减少了什么。

~# git diff dbbafd6b070a7e26ce135d0e013d8cd00e67fcd1 7f6cb263d550c0ee3fc6f8132db77f22c04b2f5> ./log_diff/commit_diff.log

附3

代码回退到指定分支点指定commit
1.拉取指定分支
1）获取指定分支：git clone [git-url] -b [branch-name]
2）获取master主分支代码：git clone usrname@url
这里已获取主分支代码为例

linux$ git clone mali_wu@11.0.0.11:/com/gitserver/test.git

2.查看日志看commit, 并退回到指定commit

linux$ git log
commit 2b9804bb693ca8e80e8e2eaf65ce7856e3515725
Author: mali <mali@ee.com>
Date:   Mon May 16 10:57:14 2022 +0800

    test commit 002

commit bf2850652a2883025e55525563ec7c18fed2ec8c
Author: li <li@ee.com>
Date:   Mon May 16 10:52:31 2022 +0800

    test commit 001
    
commit c5bef1dbb887db603a2523b8863c115103b922be
Author: li <li@ee.com>
Date:   Mon May 16 00:52:31 2022 +0800    
	test commit 000
:
linux$ git reset --hard  bf2850652a2883025e55525563ec7c18fed2ec8c

3.验证是否成功退回了

linux$ git log 
commit bf2850652a2883025e55525563ec7c18fed2ec8c
Author: li <li@ee.com>
Date:   Mon May 16 10:52:31 2022 +0800

    test commit 001
    
commit c5bef1dbb887db603a2523b8863c115103b922be
Author: li <li@ee.com>
Date:   Mon May 16 00:52:31 2022 +0800    
	test commit 000
:

从日志可以看到已经看不到test 002的提交，已经退回到了001

附4 查看某次提交的commit的某个文件的修改内容

git show f5eaa821fa3b35246b6ee516a0e50882c10dbbe4 android/frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java

附5 查看某次commit修改的内容

格式 git show commit_id

git show cdf30f0dceac60a11167d3dd7eef058c21b7cf84

附6 查看本地修改

~# git status

test@Server-5820-Tower-X-Series:~/hero/mtk/8768_android11$ git status 
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   build/make/core/Makefile
	deleted:    vendor/xxx/prebuild/car/View/lib/armeabi-v7a/libmarsxlog.so
	modified:   vendor/xxx/products/products_test.mk

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	build/make/core/test.sh

 说明：Untracked files 表示没有加入版本库的 文件，需要用git add 添加到版本库

本文内容由网友自发贡献，版权归原作者所有，本站不承担相应法律责任。如您发现有涉嫌抄袭侵权的内容，请联系:hwhale#tublm.com(使用前将#替换为@)