git常用命令

2023-05-16

一、git工作原理图

在这里插入图片描述

二、git基础命令

0x01 git help

git help [comand]	#查看帮助

0x02 git config

git config --global user.name "redwand_kali"
git config --global user.email "123456@qq.com"
git config --global core.editor vim	#设置vim编辑器
git config --list
git congfig --unset --global user.name

–global选项实际是在修改家用户目录下的～/.gitconfig文件，查看如下。

root@kali2020:~# cat .gitconfig
[user]
	email = 123456@qq.com
	name = redwand_kali

–local选项是修改项目中的变量，实际是修改project/.git/config文件，如下。

root@kali2020:~/pytest/.git# git config --local user.name "kali"
root@kali2020:~/pytest/.git# cat config
[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
[user]
	name = kali

0x03 git init

git init #初始化

初始化执行完成后会在项目目录中生成.git文件夹

root@kali2020:~/pytest/.git# ls -l
total 32
drwxr-xr-x 2 root root 4096 Apr 15 10:44 branches
-rw-r--r-- 1 root root  112 Apr 15 11:04 config
-rw-r--r-- 1 root root   73 Apr 15 10:44 description
-rw-r--r-- 1 root root   23 Apr 15 10:44 HEAD
drwxr-xr-x 2 root root 4096 Apr 15 10:44 hooks
drwxr-xr-x 2 root root 4096 Apr 15 10:44 info
drwxr-xr-x 4 root root 4096 Apr 15 10:44 objects
drwxr-xr-x 4 root root 4096 Apr 15 10:44 refs

0x04 git status
查看当前工作区的文件

root@kali2020:~/pytest# git status
On branch master

No commits yet

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

nothing added to commit but untracked files present (use "git add" to track)

0x05 git add
将工作区中的文件添加到暂存区

root@kali2020:~/pytest# git add info.php
root@kali2020:~/pytest# git status
On branch master

No commits yet

Changes to be committed:
  (use "git rm --cached <file>..." to unstage)
	new file:   info.php

git diff #查看工作区和暂存区之间文件区别

0x06 git commit

root@kali2020:~/pytest# git commit
[master (root-commit) f1af694] add info.php
 1 file changed, 3 insertions(+)
 create mode 100644 info.php
root@kali2020:~/pytest# git status
On branch master
nothing to commit, working tree clean

非交互式提交版本信息

git commit -m "add info.php"

0x07 git log
查看提交记录

root@kali2020:~/pytest# git log
commit 7819ceb1522ae7d1b0a035f7f4e03c50032ce0ea (HEAD -> master)
Author: redwand_kali <123456@qq.com>
Date:   Wed Apr 15 11:57:52 2020 -0400

    add test.py

commit 8e5f71d1802568be22663949c57dd1c505b64124
Author: redwand_kali <123456@qq.com>
Date:   Wed Apr 15 11:56:03 2020 -0400

    add sty.css

git log --oneline

root@kali2020:~/pytest# git log --oneline
7819ceb (HEAD -> master) add test.py
8e5f71d add sty.css
f1af694 add info.php

0x08 git mv
对暂存区的文件名进行修改，同时修改了工作区的文件名。mv命令只适用于未添加到暂存区文件名的修改。

root@kali2020:~/pytest# touch mvtest.js
root@kali2020:~/pytest# git add mvtest.js
root@kali2020:~/pytest# ls
info.php  mvtest.js  sty.css  test.py
root@kali2020:~/pytest# git mv mvtest.js my.js
root@kali2020:~/pytest# ls
info.php  my.js  sty.css  test.py

0x09 git rm
暂存区的文件如果被rm命令删除后，会出现deleted状态，仅此此时要删除暂存区的文件，就要使用git rm命令，如下。

root@kali2020:~/pytest# touch my.js
root@kali2020:~/pytest# git add my.js
root@kali2020:~/pytest# rm my.js
root@kali2020:~/pytest# git status
On branch master
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	new file:   my.js

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	deleted:    my.js

root@kali2020:~/pytest# git rm my.js
rm 'my.js'
root@kali2020:~/pytest# git status
On branch master
nothing to commit, working tree clean

git rm --cached 在暂存区删除文件，文件不被跟踪。

root@kali2020:~/pytest# touch my.js
root@kali2020:~/pytest# git add my.js
root@kali2020:~/pytest# git rm my.js
error: the following file has changes staged in the index:
    my.js
(use --cached to keep the file, or -f to force removal)
root@kali2020:~/pytest# git rm --cached my.js
rm 'my.js'
root@kali2020:~/pytest# git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	my.js

nothing added to commit but untracked files present (use "git add" to track)

git rm --cached 暂存区中删除，提交后删除master分支文件，而本地工作区文件不删除。

root@kali2020:~/pytest# ls
info.php  sty.css
root@kali2020:~/pytest# git rm --cached sty.css
rm 'sty.css'
root@kali2020:~/pytest# git status
On branch master
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	deleted:    sty.css

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

root@kali2020:~/pytest# git commit -m "delete sty.css"
[master 3aa357d] delete sty.css
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 sty.css
root@kali2020:~/pytest# git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	sty.css

nothing added to commit but untracked files present (use "git add" to track)

git rm -f 在暂存区和本地同时删除文件。

root@kali2020:~/pytest# git status
On branch master
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	new file:   my.js

root@kali2020:~/pytest# git rm -f my.js
rm 'my.js'
root@kali2020:~/pytest# ls
info.php  sty.css  test.py

git rm 第一步git rm删除暂存区文件，第二步git commit提交操作删除master分支中文件，同时会删除本地工作区文件。由于此时暂存区已经没有文件，因此不能使用git checkout命令撤回操作。

root@kali2020:~/pytest# ls
info.php  sty.css  test.py
root@kali2020:~/pytest# git rm test.py
rm 'test.py'
root@kali2020:~/pytest# git status
On branch master
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	deleted:    test.py

root@kali2020:~/pytest# git commit -m "delete test.py"
[master 5df6170] delete test.py
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 test.py
root@kali2020:~/pytest# ls
info.php  sty.css

0x0A git checkout – <file>
to discard changes in working directory，丢弃工作区改变操作。

git checkout -- <file>

0x0B git reset
由于–hard修改工作区文件，建议谨慎使用。

git reset <version> --soft #将版本库中内容撤回到暂存区
git reset <version> --mixed #默认选项，将版本库和暂存区内容撤回，只保留工作区
git reset <version> --hard #修改工作区、暂存区、版本库中内容

0x0C git reflog
当确实执行了git reset --hard文件时候，可以使用reflog命名恢复

root@kali2020:~/pytest# git reflog
7819ceb (HEAD -> master) HEAD@{0}: reset: moving to 7819ceb
87a1c78 HEAD@{1}: revert: Revert "add sty.css"
c849fd9 HEAD@{2}: revert: Revert "delete sty.css"
dd8dfd3 HEAD@{3}: revert: Revert "add sty.css"
eaeec47 HEAD@{4}: commit: add sty.css
f5b677b HEAD@{5}: commit: del sty.css
32b7f43 HEAD@{6}: revert: Revert "Revert "add sty.css""
11e5bcc HEAD@{7}: revert: Revert "add sty.css"
99dc28b HEAD@{8}: commit: add sty.css
0a22fb7 HEAD@{9}: commit: deleted sty.css
7aa4b1b HEAD@{10}: commit: add sty.css
3aa357d HEAD@{11}: commit: delete sty.css
5df6170 HEAD@{12}: commit: delete test.py
7819ceb (HEAD -> master) HEAD@{13}: commit: add test.py
8e5f71d HEAD@{14}: commit: add sty.css
f1af694 HEAD@{15}: commit (initial): add info.php
root@kali2020:~/pytest# git reset 7819ceb --hard
HEAD is now at 7819ceb add test.py
root@kali2020:~/pytest# git log --oneline
7819ceb (HEAD -> master) add test.py
8e5f71d add sty.css
f1af694 add info.php

三、git分支操作命令

0x0D git branch

git branch dev	#创建一个新的dev分支

git branch -d[-D] dev #删除dev分支

git branch -m dev2 dev #修改分支名称

git checkout dev #切换到dev分支

git checkout -b dev #创建一个dev分支，并切换到该分支

0x0E git merge

git merge dev #在master分支下运行命令，合并dev分支到master

第一种情况，master与dev不冲突，直接合并。不冲突是指当master分支与dev分支中，只有一个(dev)分支中内容修改，另一个没变时，使用Fast-forward方式合并分支。
master分支

root@kali2020:~/pytest# ls
info.php
root@kali2020:~/pytest# echo default > test.txt
root@kali2020:~/pytest# git add test.txt
root@kali2020:~/pytest# git commit -m "master default add test.txt"
[master 68204a8] master default add test.txt
 1 file changed, 1 insertion(+)
 create mode 100644 test.txt

dev分支

root@kali2020:~/pytest# git branch dev
root@kali2020:~/pytest# git checkout dev
Switched to branch 'dev'
root@kali2020:~/pytest# ls
info.php  test.txt
root@kali2020:~/pytest# echo dev > test.txt
root@kali2020:~/pytest# git add test.txt
root@kali2020:~/pytest# git commit -m "dev add test.txt"
[dev c9ad94b] dev add test.txt
 1 file changed, 1 insertion(+), 1 deletion(-)
root@kali2020:~/pytest# git checkout master
Switched to branch 'master'
root@kali2020:~/pytest# git merge dev
Updating 68204a8..c9ad94b
Fast-forward
 test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

此时log情况

root@kali2020:~/pytest# git log --oneline
c9ad94b (HEAD -> master, dev) dev add test.txt
68204a8 master default add test.txt
f1af694 add info.php

第二种情况，master与dev有冲突，先处理冲突后合并。这里有冲突是指master分支和dev分支都对同一个文件做了修改。
master分支

root@kali2020:~/pytest# ls
info.php
root@kali2020:~/pytest# echo default > test.txt
root@kali2020:~/pytest# git add test.txt
root@kali2020:~/pytest# git commit -m "master add test.txt"
[master b6069f3] master add test.txt
 1 file changed, 1 insertion(+)
 create mode 100644 test.txt
root@kali2020:~/pytest# echo master > test.txt
root@kali2020:~/pytest# git add test.txt
root@kali2020:~/pytest# git commit -m "master modify test.txt"
[master 8bad7d2] master modify test.txt
 1 file changed, 1 insertion(+), 1 deletion(-)

dev分支

root@kali2020:~/pytest# git checkout dev
Switched to branch 'dev'
root@kali2020:~/pytest# echo dev > test.txt
root@kali2020:~/pytest# git add test.txt
root@kali2020:~/pytest# git commit -m "dev modify test.txt"
[dev 8665249] dev modify test.txt
 1 file changed, 1 insertion(+), 1 deletion(-)

出现冲突

root@kali2020:~/pytest# git checkout master
Switched to branch 'master'
root@kali2020:~/pytest# git merge dev
Auto-merging test.txt
CONFLICT (content): Merge conflict in test.txt
Automatic merge failed; fix conflicts and then commit the result.

处理冲突，合并分支。

root@kali2020:~/pytest# vim test.txt
root@kali2020:~/pytest# cat test.txt
<<<<<<< HEAD
master
=======
dev
>>>>>>> dev
root@kali2020:~/pytest# git status
On branch master
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test.txt

no changes added to commit (use "git add" and/or "git commit -a")
root@kali2020:~/pytest# git add test.txt
root@kali2020:~/pytest# git commit test.txt -m "merge dev"
fatal: cannot do a partial commit during a merge.
root@kali2020:~/pytest# git commit -m "merge dev"
[master 82bde45] merge dev
root@kali2020:~/pytest# git diff master..dev
root@kali2020:~/pytest#

第三种情况，禁用Fast-forward，可以将合并动作记录到版本控制中。

git merge dev --no-ff -m "merge dev --no-ff"

0x0F git stash
当在dev分支开发过程中，如果在工作区正在修改代码，直接切换到master分支的话，modified会改变master分支中文件，因此需要先用git stash命令将dev分支工作区修改的内容暂存起来。然后再修改bug，提交，最后到master合并。合并完成后git stash pop出栈，继续dev开发工作。

git stash #封存工作区修改代码的内容

git stash pop #dev分支释放封存区内容继续开发

git stash apply stash@{0} #弹出某个编号的内容

git stash list #查看封存几次

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