git命令和smartgit使用介绍.pdf

1、 11.?git clone.2 2.smart git?.3 2.1?smart git.3 2.2?log.4 2.3?.6 2.4?Push.7 2.5?git pull?.7 2.6?merge.9 2.6?.10 2.6.1 Modified in working tree.10 2.6.2 Modified in Index.10 2.6.3 local change.11 2.6.4 file status.11 3.?.12 3.1?git status.12 3.2?git add .12 3.3?git commit m“?”.13 3.4?git add.13 3.5?g

2、it diff.13 3.6?git rm.14 3.7?git mv.15 4.?.15 4.1?git remote.15 4.2?git fetch.16 所.情?git push.16 4.4?git remote show.17 4.5?git remote rename,git remote rm.17 5.git?.17 5.1?git branch.17 5.2?git branch branchname.18 5.3?git merge.18 5.4?.18 5.5?git push origin branchname.19 5.6?git push origin:branc

3、hname.20 5.7?git merge origin/test11.20 5.8?.21 5.9?work directory.21 6.git?git reset,git revert.22 6.1?git reset.22 6.1.1?.23 6.1.2?.23 6.1.3?.25 6.1.3.1?index?working directory.25 6.1.3.2?.25 26.1.3.3?.26 6.1.3.4?commit.26 6.1.3.5?merge.27 6.1.3.6?merge,?working tree.27 6.1.3.7?.28 6.2?.29 6.3 git

4、 revert?reset?.30 7.index?working directory.30 7.1 git diff.31 1.?git clone?自it?git clone git10.219.68.248:testing 32.smart git?2.1 从程序中启动从程序中启动从程序中启动从程序中启动 smart git?Project Open Repository?clone?git?next?finish?4 2.2 查看查看查看查看 log Query-Open 5 62.3 选择分支选择分支选择分支选择分支?(git branch uidp3457)?add Branch?

5、Add Branch&Switch?7 2.4 推送推送推送推送 Push 2.5 拉取数据拉取数据拉取数据拉取数据 git pull：?merge?8 git fetch?merge 9 2.6 合并分支合并分支合并分支合并分支 merge?Query-log 10 2.6 文件各种状态文件各种状态文件各种状态文件各种状态 2.6.1 Modified in working tree 2.6.2 Modified in Index 112.6.3 local change 2.6.4 file status 123.?3.1 查看状态查看状态查看状态查看状态 git status git s

6、tatus 3.2 暂存文件暂存文件暂存文件暂存文件 git add?git status?git add test1?git status?test1?git commit?133.3 提交提交提交提交 git commit m“提交信息提交信息提交信息提交信息”3.4 暂存修改文件暂存修改文件暂存修改文件暂存修改文件 git add 3.5 查看已暂存和未暂存的查看已暂存和未暂存的查看已暂存和未暂存的查看已暂存和未暂存的更新更新更新更新 git diff 14 3.6 移除文件移除文件移除文件移除文件 git rm?-f?force?15 3.7 移动文件移动文件移动文件移动文件（重命名重

7、命名重命名重命名）git mv 4.?4.1 查看当前的远程库查看当前的远程库查看当前的远程库查看当前的远程库 git remote-v:丢?16 4.2 从远程仓库中抓取数据从远程仓库中抓取数据从远程仓库中抓取数据从远程仓库中抓取数据 git fetch?origin?git fetch origin?fetch?fetch?g程t pull g程t pull g程t pull g程t pull?g程t clone?master?master?master?g程t pull?所.情 所.情 所.情 所.情 推送数据到远程仓库推送数据到远程仓库推送数据到远程仓库推送数据到远程仓库 git pu

8、sh git push origin uidp3457 174.4 查看远程仓库信息查看远程仓库信息查看远程仓库信息查看远程仓库信息 git remote show 4.5 远程仓库的删除和重命名远程仓库的删除和重命名远程仓库的删除和重命名远程仓库的删除和重命名 git remote rename,git remote rm git remote rename origin origin-2 git remote rm origin 5.git?5.1 查看分支查看分支查看分支查看分支 git branch 185.2 创建分支创建分支创建分支创建分支 git branch branchnam

9、e?git checkout branchname?git checkout b branchname 5.3 分支合并分支合并分支合并分支合并 git merge?iss53?master?$g程t checkout master$g程t checkout master$g程t checkout master$g程t checkout master$g程t merge 程ss53$g程t merge 程ss53$g程t merge 程ss53$g程t merge 程ss53 5.4 解决冲突解决冲突解决冲突解决冲突?uidp3457/test1?19?=?HE确D?master?merge?

10、u程dp3457?5.5 推送分支推送分支推送分支推送分支 git push origin branchname?serverf程x?g程t push(g程t push(g程t push(g程t push(?)()()()(?)?$g程t push or程g程n serverf程x 205.6 删除远程分支删除远程分支删除远程分支删除远程分支 git push origin:branchname?git branch d uidp3457-fix 5.7 合并远程分支合并远程分支合并远程分支合并远程分支 git merge origin/test11 215.8 撤销合并撤销合并撤销合并撤销合

11、并 git reset-hard ORIG_HEAD?workdirectory?5.9 撤销合并并保存撤销合并并保存撤销合并并保存撤销合并并保存 work directory git mergr origin/uidp3472 22 6.git?git reset,git revert git revert?git reset?1.git revert?commit?commit?git reset?commit?2.?merge?git revert?commit“?”?branch?git reset?commit?branch?branch?merge?commit?3.git res

12、et?HEAD?git revert?HEAD?commit?revert?revert?6.1 撤销撤销撤销撤销 git reset 236.1.1?git reset HEAD filename?git?staging?add?index?git reset HEAD.?git add?git?#丢点问a?销?s丢t?丢通?丢邮?际tt?配构丢丢#丢丢丢(us?丢作销际t丢r?s?t丢由状滚然丢?际首?母将将将作丢t?丢u?sta销?因丢丢#丢丢#丢?w丢?际首?构丢丢丢致?st将s邮a首a丢丢 6.1.2?git reset-hard|soft|mixed|merge|keep?HEAD

13、?reset?HEAD?commit?HEAD?mode?index?working directory?mode?hard?soft?mixed?merged?keep?A).-hard?reset?index?working directory?working directory?HEAD?commit?git st:邮?际t息构丢a配配丢t?st息将邮丢邮?际t必构丢a配配丢t?st必将邮丢邮?际t式构丢a配配丢t?st式将邮丢?git reset-hard HEAD1?(?)?HEAD is now at commit2?git log 邮?际t必构丢a配配丢t?st必将邮丢邮?际t式

14、构丢a配配丢t?st式将邮丢?git st?24B).-soft?index?working directory?HEAD?git status?Changes to be committed?commit?git st:邮?际t息构丢a配配丢t?st息将邮丢邮?际t必构丢a配配丢t?st必将邮丢邮?际t式构丢a配配丢t?st式将邮丢?git reset-soft(?)HEAD1?commit,?stage?git log 邮?际t必构丢a配配丢t?st必将邮丢邮?际t式构丢a配配丢t?st式将邮丢?git status?test3.c?git commit?git?patch?patch?g

15、it?a-b-c?a?b?c?a?c?b?a?c?patch?path?patch?git-reset?a?tag?A?git-reset-soft A?a?b?c?c?a-d?d?c?patch?C).-mixed?reset index?reset working directory?git reset?mixed?working 25directory?Changes to be committed?Unstaged changes after reset:M Test.Scala M test.txt 6.1.3?6.1.3.1?index?working directory A)?a

16、dd?$edit (1)$git add frotz.c filfre.c$mailx?(2)$git reset (3)/?index?working directory?$git pull git:/ (4)(1)?frotz.c,filfre.c?index (2)?pull?merge?(3)?index?index?HEAD commit?pull?frotz.c?filfre.c?revert?resetrevert?working directory?git reset?(4)?pull?merge?frotz.c?filfre.c?working directory?6.1.3.2?B)?commit?$git commit.$git reset-soft HEAD (1)$edit (2)26$git commit-a-c ORIG_HEAD (3)/?reset?commit?(1)?comment?git reset-soft HEAD?working tree?reset?HEAD?HEAD?commit?(2)?working tree?(3)?reset?c