git命令和smartgit使用介绍.pdf

git命令和smartgit使用介绍.pdf

《git命令和smartgit使用介绍.pdf》由会员分享，可在线阅读，更多相关《git命令和smartgit使用介绍.pdf（33页珍藏版）》请在冰豆网上搜索。

11.?

gitclone.22.smartgit?

.32.1?

smartgit.32.2?

log.42.3?

.62.4?

Push.72.5?

gitpull?

.72.6?

merge.92.6?

.102.6.1Modifiedinworkingtree.102.6.2ModifiedinIndex.102.6.3localchange.112.6.4filestatus.113.?

.123.1?

gitstatus.123.2?

gitadd.123.3?

gitcommitm“?

”.133.4?

gitadd.133.5?

gitdiff.133.6?

gitrm.143.7?

gitmv.154.?

.154.1?

gitremote.154.2?

gitfetch.16所.情?

gitpush.164.4?

gitremoteshow.174.5?

gitremoterename,gitremoterm.175.git?

.175.1?

gitbranch.175.2?

gitbranchbranchname.185.3?

gitmerge.185.4?

.185.5?

gitpushoriginbranchname.195.6?

gitpushorigin:

branchname.205.7?

gitmergeorigin/test11.205.8?

.215.9?

workdirectory.216.git?

gitreset,gitrevert.226.1?

gitreset.226.1.1?

.236.1.2?

.236.1.3?

.256.1.3.1?

index?

workingdirectory.256.1.3.2?

.2526.1.3.3?

.266.1.3.4?

commit.266.1.3.5?

merge.276.1.3.6?

merge,?

workingtree.276.1.3.7?

.286.2?

.296.3gitrevert?

reset?

.307.index?

workingdirectory.307.1gitdiff.311.?

gitclone?

自it?

gitclonegit10.219.68.248:

testing32.smartgit?

2.1从程序中启动从程序中启动从程序中启动从程序中启动smartgit?

ProjectOpenRepository?

clone?

git?

next?

finish?

42.2查看查看查看查看logQuery-Open562.3选择分支选择分支选择分支选择分支?

（gitbranchuidp3457）?

addBranch?

AddBranch&Switch?

72.4推送推送推送推送Push2.5拉取数据拉取数据拉取数据拉取数据gitpull：

?

merge?

8gitfetch?

merge92.6合并分支合并分支合并分支合并分支merge?

Query-log102.6文件各种状态文件各种状态文件各种状态文件各种状态2.6.1Modifiedinworkingtree2.6.2ModifiedinIndex112.6.3localchange2.6.4filestatus123.?

3.1查看状态查看状态查看状态查看状态gitstatusgitstatus3.2暂存文件暂存文件暂存文件暂存文件gitadd?

gitstatus?

gitaddtest1?

gitstatus?

test1?

gitcommit?

133.3提交提交提交提交gitcommitm“提交信息提交信息提交信息提交信息”3.4暂存修改文件暂存修改文件暂存修改文件暂存修改文件gitadd3.5查看已暂存和未暂存的查看已暂存和未暂存的查看已暂存和未暂存的查看已暂存和未暂存的更新更新更新更新gitdiff143.6移除文件移除文件移除文件移除文件gitrm?

-f?

force?

153.7移动文件移动文件移动文件移动文件（重命名重命名重命名重命名）gitmv4.?

4.1查看当前的远程库查看当前的远程库查看当前的远程库查看当前的远程库gitremote-v:

丢?

164.2从远程仓库中抓取数据从远程仓库中抓取数据从远程仓库中抓取数据从远程仓库中抓取数据gitfetch?

origin?

gitfetchorigin?

fetch?

fetch?

g程tpullg程tpullg程tpullg程tpull?

g程tclone?

master?

master?

master?

g程tpull?

所.情所.情所.情所.情推送数据到远程仓库推送数据到远程仓库推送数据到远程仓库推送数据到远程仓库gitpushgitpushoriginuidp3457174.4查看远程仓库信息查看远程仓库信息查看远程仓库信息查看远程仓库信息gitremoteshow4.5远程仓库的删除和重命名远程仓库的删除和重命名远程仓库的删除和重命名远程仓库的删除和重命名gitremoterename,gitremotermgitremoterenameoriginorigin-2gitremotermorigin5.git?

5.1查看分支查看分支查看分支查看分支gitbranch185.2创建分支创建分支创建分支创建分支gitbranchbranchname?

gitcheckoutbranchname?

gitcheckoutbbranchname5.3分支合并分支合并分支合并分支合并gitmerge?

iss53?

master?

$g程tcheckoutmaster$g程tcheckoutmaster$g程tcheckoutmaster$g程tcheckoutmaster$g程tmerge程ss53$g程tmerge程ss53$g程tmerge程ss53$g程tmerge程ss535.4解决冲突解决冲突解决冲突解决冲突?

uidp3457/test1?

19?

=?

HE确D?

master?

merge?

u程dp3457?

5.5推送分支推送分支推送分支推送分支gitpushoriginbranchname?

serverf程x?

g程tpush（g程tpush（g程tpush（g程tpush（?

）（）（）（）（?

）?

$g程tpushor程g程nserverf程x205.6删除远程分支删除远程分支删除远程分支删除远程分支gitpushorigin:

branchname?

gitbranchduidp3457-fix5.7合并远程分支合并远程分支合并远程分支合并远程分支gitmergeorigin/test11215.8撤销合并撤销合并撤销合并撤销合并gitreset-hardORIG_HEAD?

workdirectory?

5.9撤销合并并保存撤销合并并保存撤销合并并保存撤销合并并保存workdirectorygitmergrorigin/uidp3472226.git?

gitreset,gitrevertgitrevert?

gitreset?

1.gitrevert?

commit?

commit?

gitreset?

commit?

2.?

merge?

gitrevert?

commit“?

”?

branch?

gitreset?

commit?

branch?

branch?

merge?

commit?

3.gitreset?

HEAD?

gitrevert?

HEAD?

commit?

revert?

revert?

6.1撤销撤销撤销撤销gitreset236.1.1?

gitresetHEADfilename?

git?

staging?

add?

index?

gitresetHEAD.?

gitadd?

git?

#丢点问a?

销?

s丢t?

丢通?

丢邮?

际tt?

配构丢丢#丢丢丢（us?

丢作销际t丢r?

s?

t丢由状滚然丢?

际首?

母将将将作丢t?

丢u?

sta销?

因丢丢#丢丢#丢?

w丢?

际首?

构丢丢丢致?

st将s邮a首a丢丢6.1.2?

gitreset-hard|soft|mixed|merge|keep?

HEAD?

reset?

HEAD?

commit?

HEAD?

mode?

index?

workingdirectory?

mode?

hard?

soft?

mixed?

merged?

keep?

A）.-hard?

reset?

index?

workingdirectory?

workingdirectory?

HEAD?

commit?

gitst:

邮?

际t息构丢a配配丢t?

st息将邮丢邮?

际t必构丢a配配丢t?

st必将邮丢邮?

际t式构丢a配配丢t?

st式将邮丢?

gitreset-hardHEAD1?

（?

）?

HEADisnowatcommit2?

gitlog邮?

际t必构丢a配配丢t?

st必将邮丢邮?

际t式构丢a配配丢t?

st式将邮丢?

gitst?

24B）.-soft?

index?

workingdirectory?

HEAD?

gitstatus?

Changestobecommitted?

commit?

gitst:

邮?

际t息构丢a配配丢t?

st息将邮丢邮?

际t必构丢a配配丢t?

st必将邮丢邮?

际t式构丢a配配丢t?

st式将邮丢?

gitreset-soft（?

）HEAD1?

commit,?

stage?

gitlog邮?

际t必构丢a配配丢t?

st必将邮丢邮?

际t式构丢a配配丢t?

st式将邮丢?

gitstatus?

test3.c?

gitcommit?

git?

patch?

patch?

git?

a-b-c?

a?

b?

c?

a?

c?

b?

a?

c?

patch?

path?

patch?

git-reset?

a?

tag?

A?

git-reset-softA?

a?

b?

c?

c?

a-d?

d?

c?

patch?

C）.-mixed?

resetindex?

resetworkingdirectory?

gitreset?

mixed?

working25directory?

Changestobecommitted?

Unstagedchangesafterreset:

MTest.ScalaMtest.txt6.1.3?

6.1.3.1?

index?

workingdirectoryA）?

add?

$edit

（1）$gitaddfrotz.cfilfre.c$mailx?

（2）$gitreset（3）/?

index?

workingdirectory?

$gitpullgit:

/（4）

（1）?

frotz.c,filfre.c?

index

（2）?

pull?

merge?

（3）?

index?

index?

HEADcommit?

pull?

frotz.c?

filfre.c?

revert?

resetrevert?

workingdirectory?

gitreset?

（4）?

pull?

merge?

frotz.c?

filfre.c?

workingdirectory?

6.1.3.2?

B）?

commit?

$gitcommit.$gitreset-softHEAD

（1）$edit

（2）26$gitcommit-a-cORIG_HEAD（3）/?

reset?

commit?

（1）?

comment?

gitreset-softHEAD?

workingtree?

reset?

HEAD?

HEAD?

commit?

（2）?

workingtree?

（3）?

reset?

c