git命令和smartgit使用介绍.pdf
- 文档编号:3436676
- 上传时间:2023-05-05
- 格式:PDF
- 页数:33
- 大小:1.15MB
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?
commit?
gitreset?
git?
HEAD?
.git/ORIG_HEAD?
ORIG_HEAD?
commit?
commit?
-a?
git?
stagearea?
git?
commit?
-c?
-C?
commit?
commit?
stagearea?
6.1.3.3?
C)?
commit?
commit?
topic?
branch?
$gitbranchtopic/wip
(1)/?
HEAD?
$gitreset-hardHEAD3
(2)/?
commit$gitcheckouttopic/wip(3)/?
topic/wip?
(1)?
commit?
commit?
master?
branch?
commit?
gitbranch?
HEAD?
topic/wip?
(2)?
masterbranch?
HEAD3?
HEAD-3?
commit?
commit?
gitreset-hardHEAD3?
commit?
HEAD,HEAD,HEAD2?
HEAD?
HEAD3?
topic/wipgitbranchdtopic/wip6.1.3.4?
commitD)?
commit27?
$gitcommit.$gitreset-hardHEAD3
(1)
(1)?
commit?
HEAD,HEAD?
HEAD2?
commit?
6.1.3.5?
mergeE)?
merge?
pull?
$gitpull
(1)Auto-mergingnitfolCONFLICT(content):
MergeconflictinnitfolAutomaticmergefailed;fixconflictsandthencommittheresult.$gitreset-hard
(2)/?
index?
workingtree?
$gitpull.topic/branch(3)/(?
topic/branch?
)Updatingfrom41223.to13134.Fast-forward$gitreset-hardORIG_HEAD(4)/?
merge?
(1)?
origin?
pull?
(2)?
pull?
pull?
stagearea?
gitreset-hard?
gitreset-hardHEAD?
index?
workingtree?
(3)?
topic/branch?
branch?
(4)?
topic/branch?
merge?
gitreset-hardORIG_HEAD?
pull/merge?
gitreset?
git?
reset?
HEAD?
.git/ORIG_HEAD?
ORIG_HEAD?
commit?
pull?
merge?
git?
HEAD?
ORIG_HEAD?
6.1.3.6?
merge,?
workingtreeF)?
workingtree?
merge?
pull28?
$gitpull
(1)Auto-mergingnitfolMergemadebyrecursive.nitfol|20+-.$gitreset-mergeORIG_HEAD
(2)/?
workingtree
(1)?
workingtree?
gitpull?
pull?
workingtree?
(2)gitpull?
pull?
pull?
gitreset-hardORIG_HEAD?
workingtree?
add?
workingtree?
gitreset-mergeORIG_HEAD?
-hard?
-merge?
workingtree?
6.1.3.7?
G)?
feature?
bug?
workingtree?
commit?
branch?
fixbug?
$gitcheckoutfeature;#youwereworkinginfeaturebranchand$workworkwork;#gotinterrupted$gitcommit-a-msnapshotWIP
(1)/?
$gitcheckoutmaster$fixfixfix$gitcommit;#commitwithreallog$gitcheckoutfeature$gitreset-softHEAD;#gobacktoWIPstate
(2)/?
$gitreset(3)/?
index
(1)?
(2)?
reset?
WIPcommit?
workingtree?
WIP?
29(3)?
index?
“snapshotWIP”?
uncommitchanges?
gitreset?
index?
snapshotWIP?
(I)?
workingtree?
commit?
workingtree?
branch?
commit?
branch?
workingtree?
$gittagstart$gitcheckout-bbranch1$edit$gitcommit.
(1)$edit$gitcheckout-bbranch2
(2)$gitreset-keepstart(3)/?
start?
commit?
workingtree?
(1)?
branch1?
(2)?
branch?
branch2?
branch2?
(3)?
reset-keep?
start?
commit?
workingtree?
6.2恢复恢复恢复恢复撤销撤销撤销撤销$gitreset-hardHEADHEADisnowat1a75c1d.addedfile1$catfile2cat:
file2:
Nosuchfileordirectory$gitreflog1a75c1d.HEAD0:
reset-hardHEAD:
updatingHEADf6e5064.HEAD1:
commit:
addedfile2$gitreset-hardf6e5064?
HEADisnowatf6e5064.addedfile2306.3gitrevert和和和和reset的区别的区别的区别的区别gitrevert?
reset?
gitrevert?
gitreset?
gitrevert?
commit?
gitreset?
commit?
gitst:
commit3:
addtest3.ccommit2:
addtest2.ccommit1:
addtest1.c?
gitrevertHEAD1?
commit2?
gitlog?
commit1?
addtest1.ccommit3?
addtest3.cgitst?
gitreset-soft(?
)HEAD1?
gitlogcommit2:
addtest2.ccommit1:
addtest1.c?
gitst?
test3.c?
gitreset-hardHEAD1?
HEADisnowatcommit2?
gitlogcommit2:
addtest2.ccommit1:
addtest1.c?
gitst?
7.index?
workingdirectory式将丢W?
r题际?
销丢然际r?
邮t?
ry?
丢丢生际t?
w?
r题际?
销丢tr?
通ra?
邮问?
生相致?
生相致?
丢丢丢必将丢生相致丢然际r?
邮t?
ry?
生相致?
丢丢31?
生相致生相致生相致生相致?
丢丢丢息将丢生相致丢相?
配?
x?
生际t?
丢丢生际t丢际?
配?
x丢?
生际t?
sta销际?
销丢ar?
a?
生际t丢际?
配?
x?
生际t丢相?
配?
x?
生际t丢肯ta销际?
销丢ar?
a?
a配配a配配a配配a配配?
邮?
际t邮?
际t邮?
际t邮?
际t?
际?
配?
x?
销际t丢销际t丢销际t丢销际t丢statusstatusstatusstatus?
丢丢?
点问a?
销?
s丢t?
丢通?
丢邮?
际tt?
配?
相?
配?
x?
邮?
际t?
生际t丢然际r?
邮t?
ry?
丢丢?
点问a?
销?
配丢通ut丢?
t丢u?
配at?
配?
W?
r题际?
销丢然际r?
邮t?
ry?
a配配?
相?
配?
x?
丢丢?
般?
tra邮题?
配丢?
际首?
s?
生际t?
a配配?
相?
配?
x?
丢?
销际t丢际?
配?
x?
丢丢滚因将丢销际t丢a配配丢?
at问母将将将销际t丢a配配丢?
at问母将将将销际t丢a配配丢?
at问母将将将销际t丢a配配丢?
at问母将将将?
w?
r题际?
销丢配际r?
邮t?
ry?
销际t丢际?
配?
x?
丢丢B因将丢销际t丢r?
s?
t丢由状滚然丢?
at问母将将将销际t丢r?
s?
t丢由状滚然丢?
at问母将将将销际t丢r?
s?
t丢由状滚然丢?
at问母将将将销际t丢r?
s?
t丢由状滚然丢?
at问母将将将?
销际t丢际?
配?
x?
at问?
w?
r题际?
销丢配际r?
邮t?
ry?
7.1gitdiff销际t丢配际?
w?
r题际?
销丢tr?
w?
r题际?
销丢tr?
w?
r题际?
销丢tr?
w?
r题际?
销丢tr?
际?
配?
x际?
配?
x际?
配?
x际?
配?
x?
际?
配?
x际?
配?
x际?
配?
x际?
配?
x?
销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry?
w?
r题际?
销丢tr?
w?
r题际?
销丢tr?
w?
r题际?
销丢tr?
w?
r题际?
销丢tr?
销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry?
销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry?
邮?
际t邮?
际t邮?
际t邮?
际t?
丢丢丢丢丢丢丢丢销际t丢配际?
丢行?
at问母将将将销际t丢配际?
丢行?
at问母将将将销际t丢配际?
丢行?
at问母将将将销际t丢配际?
丢行?
at问母将将将?
a配配?
际?
配?
x?
a配配?
际?
配?
x?
w?
r题际?
销丢w?
r题际?
销丢w?
r题际?
销丢w?
r题际?
销丢配际r?
邮t?
ry配际r?
邮t?
ry配际r?
邮t?
ry配际r?
邮t?
ry?
际?
配?
x际?
配?
x际?
配?
x际?
配?
x?
丢丢丢销际t丢配际?
丢销际t丢配际?
丢销际t丢配际?
丢销际t丢配际?
丢-邮a邮问?
配丢行?
at问母将将将邮a邮问?
配丢行?
at问母将将将邮a邮问?
配丢行?
at问母将将将邮a邮问?
配丢行?
at问母将将将?
a配配?
际?
配?
x?
邮?
际t?
邮?
际t?
际?
配?
x际?
配?
x际?
配?
x际?
配?
x?
销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry销际t丢配际r?
邮t?
ry?
丢32丢丢销际t丢配际?
丢销际t丢配际?
丢销际t丢配际?
丢销际t丢配际?
丢-邮a邮问?
配丢行邮?
际t母丢行?
at问母将将将邮a邮问?
配丢行邮?
际t母丢行?
at问母将将将邮a邮问?
配丢行邮?
际t母丢行?
at问母将将将邮a邮问?
配丢行邮?
际t母丢行?
at问母将将将?
a配配?
际?
配?
x?
邮?
际t邮?
际t邮?
际t邮?
际t?
邮?
际t母邮?
际t母邮?
际t母邮?
际t母?
邮?
际t母?
际?
配?
x?
销际t丢配际r?
邮t?
ry?
丢丢丢丢销际t丢配际?
丢邮?
际t母丢行?
at问母将将将销际t丢配际?
丢邮?
际t母丢行?
at问母将将将销际t丢配际?
丢邮?
际t母丢行?
at问母将将将销际t丢配际?
丢邮?
际t母丢行?
at问母将将将?
邮?
际t母邮?
际t母邮?
际t母邮?
际t母?
邮?
际t邮?
际t邮?
际t邮?
际t?
生际t丢配际r?
邮t?
ry?
邮?
际t母次由状滚然?
通ra?
邮问?
邮?
际t母次?
丢丢丢销际t丢配际?
丢邮?
际t母丢邮?
际t母丢行?
at问母将将将销际t丢配际?
丢邮?
际t母丢邮?
际t母丢行?
at问母将将将销际t丢配际?
丢邮?
际t母丢邮?
际t母丢行?
at问母将将将销际t丢配际?
丢邮?
际t母丢邮?
际t母丢行?
at问母将将将?
销际t丢配际r?
邮t?
ry?
邮?
际t母?
邮?
际t母?
邮?
际t母?
由状滚然?
丢33
- 配套讲稿:
如PPT文件的首页显示word图标,表示该PPT已包含配套word讲稿。双击word图标可打开word文档。
- 特殊限制:
部分文档作品中含有的国旗、国徽等图片,仅作为作品整体效果示例展示,禁止商用。设计者仅对作品中独创性部分享有著作权。
- 关 键 词:
- git 命令 smartgit 使用 介绍