Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

a #2

Open
wants to merge 3,701 commits into
base: master
Choose a base branch
from
Open

a #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3701 commits
Select commit Hold shift + click to select a range
0fbab42
ThanksTeacher (#2490)
Pengtap Nov 25, 2017
ec7c705
ZWH git 学习心得 (#2491)
MrZWH Nov 25, 2017
27f30e1
creat note (#2492)
WithWindLuo Nov 25, 2017
0cac4a5
Create ff (#2494)
ttt777t7 Nov 25, 2017
1a48c4a
williamsun1993的心得 (#2495)
williamsun1993 Nov 25, 2017
da83167
git summary (#2496)
xue-dada Nov 25, 2017
440b628
learning git (#2498)
Nov 25, 2017
29c804f
add cheng_pullRequest.txt (#2499)
Chenglongyi Nov 25, 2017
83aca01
测试一下 (#2497)
joeycooper Nov 25, 2017
7da08be
这是一个很长很长很长很长很长很长很长很长很长很长很长很长名字的文件.txt (#2467)
yinshicong Nov 25, 2017
e2017b6
“requestPull (#2515)
startaprl Nov 28, 2017
88b8a4d
Rename my-github-id.txt to happy_pie's-github-id.txt (#2514)
littleHappyPie Nov 28, 2017
7fe82f8
Create 6157457.md (#2513)
Andyluo Nov 28, 2017
9dd663f
Create 谢谢廖老师! (#2511)
Nov 28, 2017
898e946
thanks (#2510)
Nov 28, 2017
889c6eb
Create 传道授业解惑,一下午的学习心情舒畅 (#2509)
lhaotian Nov 28, 2017
24e6e07
add thanksbyBIN (#2508)
Nov 28, 2017
def321c
My study record (#2507)
tuchao1996 Nov 28, 2017
1129ee9
pull request (#2506)
88548886 Nov 28, 2017
12f92b4
learngit pull request (#2505)
shimminZ Nov 28, 2017
a35a56f
my pull test (#2501)
NElight Nov 28, 2017
cdcdfa4
17.11.26谢谢廖老师.txt (#2504)
blueyescode Nov 28, 2017
5452107
liqing thanks (#2503)
leokq Nov 28, 2017
7283b43
Thanks for master Liao and test for pull-request (#2516)
Nov 30, 2017
9ab40d7
Create learning-github-stevey350 (#2519)
stevey350 Nov 30, 2017
9305ddb
git-learning is added (#2522)
minny777 Nov 30, 2017
bd39503
fork提交练习 (#2521)
SpaceRoller Nov 30, 2017
9337b50
ceshi (#2517)
luguanmin Nov 30, 2017
d4cfb31
pull request (#2520)
Nov 30, 2017
a3e8181
感谢廖老师:) (#2528)
yangeee Dec 2, 2017
3fa1510
this is thins (#2523)
Dec 2, 2017
4b25461
不可描述 (#2524)
rkl3ng Dec 2, 2017
52dca41
commit (#2525)
rensish Dec 2, 2017
d9662bf
thank you (#2526)
xiaoling000666 Dec 2, 2017
8c525d2
学生Yann (#2550)
HooYann Dec 13, 2017
f1102c1
test pull request (#2551)
lelewolf Dec 13, 2017
cbde854
Create lijun9250lj-学习Git心得 (#2552)
lijun9250lj Dec 13, 2017
eff8345
Create handsomeTest (#2549)
nanmanJack Dec 13, 2017
437ac6a
Create LearnGit (#2542)
leiting1998 Dec 13, 2017
c81acd6
thanks for everything (#2544)
Duola-li Dec 13, 2017
f79708f
Create Kyrie (#2545)
z619850002 Dec 13, 2017
0e247f9
add (#2547)
lqblgl Dec 13, 2017
0464134
zhangbin在廖老师的fork上学习 (#2548)
supermanklk Dec 13, 2017
66fd9a2
pull request (#2529)
Elizabeth-l Dec 13, 2017
ad5954e
Create Git Notes for zhanxc (#2530)
jambo-dtc Dec 13, 2017
6128541
millionthanks (#2534)
FlashMickeyMouse Dec 13, 2017
95b3591
Create 635418797.txt (#2533)
635418797 Dec 13, 2017
359e317
miou777 thank you letter (#2532)
miou777 Dec 13, 2017
0c8f285
mine (#2535)
micaixiaoduanku Dec 13, 2017
afe2550
haichong (#2536)
haichong Dec 13, 2017
689ad81
add a donation directory (#2537)
beforeold Dec 13, 2017
2d7faa8
thanks.txt (#2538)
tianku123 Dec 13, 2017
a6943db
chenxiao (#2539)
starriver9101 Dec 13, 2017
77e1e3e
11 (#2540)
monyee Dec 13, 2017
2989c3a
homework for Manlin (#2553)
Manlinup Dec 13, 2017
87449fe
Create jeff liu的学习日记 (#2531)
a496482927 Dec 13, 2017
500f050
这是一个测试pull (#2558)
GongFuBoy Dec 14, 2017
b5fec02
Create lemon12341.txt (#2557)
lemon12341 Dec 14, 2017
3c8bbee
thanks (#2554)
nick1658 Dec 14, 2017
493a0e0
upload XYF's learning book (#2565)
yuefeixu Dec 19, 2017
9b44322
Rename learning to learning MeCocoaCat (#2564)
MrCocoaCat Dec 19, 2017
d37eec1
Create PR testing (#2562)
zdhNarsil Dec 19, 2017
a51d362
test pull request (#2569)
UsherYue Dec 19, 2017
3e13234
[learngit-1]pull-request test (#2568)
jianjianl Dec 19, 2017
20d9e79
Create 000000000001.md (#2567)
Dec 19, 2017
0c8b79b
A test. (#2566)
liuxiankun Dec 19, 2017
b776931
谢谢 (#2570)
137704396 Dec 19, 2017
f82e50a
test (#2571)
chujiangke Dec 19, 2017
20feb74
感谢廖老师 (#2561)
tstyllr Dec 19, 2017
5e13e59
edited by kxhit (#2563)
kxhit Dec 19, 2017
f83297f
Create lqq119119.txt (#2560)
lqq119119 Dec 19, 2017
93f1c89
Thanks for techear liao's teachings! (#2572)
imChenmengzhou Dec 19, 2017
1a1c2b2
Create zmq.txt (#2649)
zhaiminqian Jan 20, 2018
1757bdd
Like I Care (#2647)
iizq Jan 20, 2018
9365c41
github谢谢廖老师 (#2646)
ycdg Jan 20, 2018
83745ec
pull request test (#2645)
EvanShawQc Jan 20, 2018
3f23aaf
thanks (#2637)
zhuxiaoxi Jan 20, 2018
81c02eb
GitHub学习心得 (#2639)
Jan 20, 2018
607ef5d
Create a.啦啦啦啦啦 (#2640)
qiaolin-li Jan 20, 2018
6f59b07
Create git常用命令 (#2641)
qwebh3210 Jan 20, 2018
9555181
ZhengweiMark (#2642)
ZhengWeiMark Jan 20, 2018
909148b
太棒了 (#2643)
webJackchen Jan 20, 2018
6552be6
This is a unbelievable course! (#2628)
captainzhou1021 Jan 20, 2018
c736263
修改 (#2627)
davidvivi Jan 20, 2018
77df32d
test : github's pull request (#2629)
wdeo3601 Jan 20, 2018
6bf9f00
Rename your-github-id to your-github-sun (#2630)
shuchen007 Jan 20, 2018
fe5d81a
.............. (#2631)
xcw-coder Jan 20, 2018
bdc3599
try (#2632)
cyanxxx Jan 20, 2018
3f0c82b
want to pr (#2633)
leaon4 Jan 20, 2018
3af20fa
test (#2634)
wx-satellite Jan 20, 2018
ab5ee52
Create helloman123.txt (#2635)
blanket123 Jan 20, 2018
2a1ded8
Create haha201801169001 (#2636)
lihehua Jan 20, 2018
0593d81
添加一个git中常用命令的list (#2617)
LeePaco Jan 20, 2018
49ff58b
[email protected] commit (#2618)
Ihone8 Jan 20, 2018
75b44f0
Create learngitcmd (#2619)
Dadoou Jan 20, 2018
b011806
Create TestPushReq (#2620)
cchencool Jan 20, 2018
2e20353
Create file (#2621)
kid727 Jan 20, 2018
f5aa919
谢谢廖老师 (#2622)
0393yuchaoWu Jan 20, 2018
891be40
vince (#2623)
sovince Jan 20, 2018
cc7d492
Yolanda added the learning note of git (#2624)
Yolandapp Jan 20, 2018
ea9ad3b
增加Git笔记的思维导图 (#2625)
liwuhou Jan 20, 2018
3f199a3
感谢~! (#2626)
Jan 20, 2018
98c3612
Thanks liao (#2616)
lotusgrm Jan 20, 2018
ca6fa11
nnn (#2615)
yinqingh Jan 20, 2018
9c50536
test pull request! (#2614)
cheng-dcl Jan 20, 2018
d4d2f77
test_gw (#2613)
gwangchn Jan 20, 2018
89260f5
Old-wang love you! (#2612)
Jan 20, 2018
4be4501
关于git的心得 (#2611)
kevinliukaiwen Jan 20, 2018
3e941f1
learn git (#2610)
nwy000 Jan 20, 2018
129b452
Create 3677408.txt (#2609)
xiao-xiaoming Jan 20, 2018
4724206
Create 学习心得20180105 (#2608)
paul007wang Jan 20, 2018
e99a032
test for pull request,谢谢廖老师! (#2595)
ZhouXiaorui1993 Jan 20, 2018
fdcc91f
this is coming from nickel's thanks (#2596)
cumtsgw Jan 20, 2018
8c38a41
Create kingsonKai (#2598)
KingsonKai Jan 20, 2018
31f9dcd
Create fw.txt (#2599)
fwpsl Jan 20, 2018
d4a8954
谢谢 (#2607)
ranwawa Jan 20, 2018
120daca
测试pull request (#2606)
wjw353830223 Jan 20, 2018
610fe20
Create Git 简明指令.md (#2605)
cpj001 Jan 20, 2018
c0425ee
first pull request.thanks! (#2604)
stephenLin914 Jan 20, 2018
45fe31b
git experience (#2603)
honglechuan Jan 20, 2018
98b1b0e
Create testPullRequestByEdwardsola (#2602)
edwardsola Jan 20, 2018
9b26ce4
尝试一次 (#2601)
Jingnan-Jia Jan 20, 2018
c415335
test (#2585)
chfdeng Jan 20, 2018
caec8fa
add mynote (#2584)
1124579147 Jan 20, 2018
955c24c
Create 测试pr (#2592)
kanchi240 Jan 20, 2018
8d45a4d
Thanks teacher Liao (#2586)
BigBigFire Jan 20, 2018
fd435da
dd (#2594)
Youngons Jan 20, 2018
0cbc2b9
Create Hunter-Chen.txt (#2600)
Hunter-Chen Jan 20, 2018
8935e6b
Update - -Mr. liao 您好,兰林书- -.txt (#2573)
pcbook22 Jan 20, 2018
0ab65ad
modify ebaobao.txt (#2574)
chigx Jan 20, 2018
61fbce5
Create tydqcjj学习笔记.md (#2575)
tydqcjj Jan 20, 2018
50608bf
Create cccshuang.txt (#2576)
cccshuang Jan 20, 2018
be7f288
命令汇总 (#2577)
gakkiii Jan 20, 2018
f2f3615
我是今天的幸运儿吗? (#2578)
xingke123 Jan 20, 2018
45da3f4
Create ghostratel.txt (#2579)
wicked-knife Jan 20, 2018
56f7379
add kevin 20171224 第一次测试git fork (#2580)
jc0803kevin Jan 20, 2018
24ebec5
nihao (#2581)
mcontemplation Jan 20, 2018
a7e64e7
pull requests test (#2582)
Niejinge Jan 20, 2018
da91ca3
learn git (#2583)
JuneNight Jan 20, 2018
10a6982
Create lulu (#2588)
ssxlulu Jan 20, 2018
51d4a94
test for pull request (#2590)
DolphZiggler Jan 20, 2018
e35045a
niaocaics学习笔记 (#2675)
mengxinayan Feb 1, 2018
5a06c00
非常喜欢,感谢 (#2677)
uamyangel Feb 1, 2018
2535e5e
前路不易,继续前行 感谢 (#2679)
cexiguo Feb 1, 2018
b0d22a4
Create 感谢的廖老师 (#2678)
chenlh0105 Feb 1, 2018
e9dc6ef
Create lechao25.txt (#2657)
lechao255 Feb 1, 2018
e677ab0
感谢廖老师的教程 (#2659)
JenkinWang Feb 1, 2018
770ab03
what my learn (#2660)
219gauss Feb 1, 2018
72dee51
学习。。。。 (#2661)
weiweiVip Feb 1, 2018
f22d46f
add xuhuanli dir (#2662)
Feb 1, 2018
b3864dd
Hello! (#2669)
CkTD Feb 1, 2018
a132233
Pull request test: https://www.liaoxuefeng.com/wiki/00137395163059296…
tycao Feb 1, 2018
b085c30
Create GitHub_huaihuai62 (#2672)
FANGYuan827 Feb 1, 2018
3a80f0d
Create ypstext (#2673)
jiankeyps Feb 1, 2018
b960674
Create new_gitfile.txt (#2674)
yanpeihao Feb 1, 2018
8eb96a4
hello Dr.Liao (#2680)
helloLycon Feb 1, 2018
cacd01a
add 20180201.txt (#2681)
landunigu Feb 1, 2018
d454aaa
这是pull的练习测试 (#2652)
caoql Feb 1, 2018
511275f
Create yousi-github-id (#2650)
yousi2016 Feb 1, 2018
0581a35
test from 9488 (#2651)
9488 Feb 1, 2018
237f040
add rqtn.txt (#2670)
RQTN Feb 1, 2018
5167faf
zjj-hopes 感谢廖老师 (#2653)
zjj-hopes Feb 1, 2018
b348b13
wow (#2654)
jrbin Feb 1, 2018
d3fc57d
增加一点东西 (#2655)
FrontCoder1 Feb 1, 2018
fc891d2
提交git学习笔记 (#2656)
ChenYizhu97 Feb 1, 2018
2e0abec
Create learning (#2664)
meison92 Feb 1, 2018
4da6bd3
咕咕咕咕 (#2665)
Feb 1, 2018
0da75ee
OisCircle learn git (#2666)
OisCircle Feb 1, 2018
169e409
add hellobei.txt (#2671)
hellobei Feb 1, 2018
749aa06
nicklgw pull request test (#2687)
nicklgw Feb 8, 2018
f1aa9c8
add renyun.md file (#2693)
renyuns Feb 8, 2018
2e0d55e
fromBYR (#2692)
yt605155624 Feb 8, 2018
d3ce278
(๑•̀ㅂ•́)و✧牛牪犇 (#2695)
Feb 8, 2018
2e0dfc0
add my files (#2694)
bigwhitetree Feb 8, 2018
c4aafd4
LazySheep-Yang pull (#2689)
LazySheep-Yang Feb 8, 2018
19e5b3b
add (#2688)
sqmax Feb 8, 2018
dee1ba0
create new file by chyen (#2690)
Xhyen Feb 8, 2018
103716e
thanks (#2691)
HappinessTime Feb 8, 2018
a464eb0
study-github (#2684)
songerhao Feb 8, 2018
f957be3
add lzm file txt (#2683)
webjimmylau Feb 8, 2018
5b86a67
lihao2333 (#2685)
lihao2333 Feb 8, 2018
8c53e46
jason-test.txt (#2703)
Feb 16, 2018
c99df4f
Notes-by-LADYHR (#2701)
LADYHR Feb 16, 2018
625b840
add my txt (#2700)
AzureMaker Feb 16, 2018
02fc265
Freddie Sun (#2699)
FreddieSun Feb 16, 2018
f4fba23
pull request (#2698)
373616885 Feb 16, 2018
fd7757d
add zhihu.py (#2697)
linuxying Feb 16, 2018
6a8575c
Don的学习笔记
liaoerdong Feb 23, 2018
1399cd8
Create kavanLi
kavanLi Feb 26, 2018
395a3dc
succed in learning
kirioxiangmeow Feb 27, 2018
361a30e
Create ryan-github-101.txt
zhaohao-1004 Feb 27, 2018
9542686
Thanks for Professor Liao
gilberthon Mar 2, 2018
2ff7c9f
Thanks for /Professor/ Liao
gilberthon Mar 2, 2018
28b3a29
Thanks for "Professor" Liao
gilberthon Mar 2, 2018
935b78e
add notes
fangaozhuo Mar 4, 2018
b6f8539
test pull request
yangshuovictor Mar 5, 2018
ca56e1c
add a file based on by2016ling's experience
Mar 5, 2018
f67fe22
add floder Git学习笔记-Wangxiao by wangxiao
LittlePrinceWX Mar 6, 2018
9bcb167
测试push
TridentHuang Mar 6, 2018
c3dbd62
learn think about
Mar 7, 2018
d2ceb3a
think about git
Mar 7, 2018
192b134
Test fork and clone to local, then push to GitHub
YangXinxiang Mar 7, 2018
83ae8f2
Create tt.txt
x01030 Mar 7, 2018
5bbffd5
pull request (#2704)
yuekai123456 Mar 11, 2018
3c46bea
Create chanmufeng心得 (#2705)
chanmufeng Mar 11, 2018
beccac2
Add your-github-id-2.txt
xinbin818 Feb 24, 2018
89c0c35
Create 20180224.txt
zouyui Feb 24, 2018
18eca80
add a folder
mmmssy Feb 23, 2018
7024898
add oniononion.txt 谢谢廖老师
NianLi71 Feb 27, 2018
19d7faf
感谢分享
tkwangpeng Feb 27, 2018
6b6addb
感谢分享
tkwangpeng Feb 27, 2018
a32f74f
感谢分享
tkwangpeng Feb 27, 2018
536e68b
Create shenjunhu-test-thanks
shenjunhu Mar 8, 2018
c2faca5
峰峰老师,你不接受的话,就不好了:-)
htps2 Feb 28, 2018
97a807a
test pull request
MatthewTJN Feb 28, 2018
96bcc01
add [email protected] file
homeguys Feb 28, 2018
fed7d97
test pull request
ruanzupan Mar 9, 2018
7b0c0a0
test pull request
ruanzupan Mar 9, 2018
8bb9cdf
Update [email protected]
ruanzupan Mar 9, 2018
4478ba3
Mondify readme and add handsomeguy.md
Mar 11, 2018
298e7da
Add README.MD
Mar 11, 2018
00f9da4
Thank you very much, Master Liao!
mikasama Mar 11, 2018
6074a3a
Thank you , Master Liao !
mikasama Mar 11, 2018
7eb7d72
pull request test
Jaycee37 Mar 9, 2018
94a3499
zingTse learn note
Mar 11, 2018
b7584a0
zingtse learn note
Mar 11, 2018
2f38c58
Delete git.txt
zerchin Mar 11, 2018
410e6c2
thank you teacher!
dongyu1009 Mar 9, 2018
c3495ea
thx for apply this rpo
kingback07 Mar 9, 2018
d0115e0
title-廖老师,给个机会。i'm yeyuming (#2724)
yeyuming Mar 11, 2018
d35be71
Merge pull request #2725 from gilberthon/master
michaelliao Mar 11, 2018
7621446
Merge pull request #2726 from fangaozhuo/master
michaelliao Mar 11, 2018
7fb75b2
Merge pull request #2727 from yangshuovictor/master
michaelliao Mar 11, 2018
4787dfc
Merge pull request #2728 from by2016ling/master
michaelliao Mar 11, 2018
148599a
Merge pull request #2732 from scut-cjt/master
michaelliao Mar 11, 2018
9239b4d
Merge pull request #2731 from TridentHuang/master
michaelliao Mar 11, 2018
b7116b3
Merge pull request #2733 from YangXinxiang/master
michaelliao Mar 11, 2018
18bc5ef
Merge pull request #2734 from x01030/master
michaelliao Mar 11, 2018
8e39e11
Merge pull request #2706 from qq441574842/master
michaelliao Mar 11, 2018
d7b03b8
Merge pull request #2730 from LittlePrinceWX/master
michaelliao Mar 11, 2018
28b91be
Merge pull request #2718 from pikani/master
michaelliao Mar 11, 2018
1df1056
Merge pull request #2714 from kirioxiangmeow/master
michaelliao Mar 11, 2018
27cb760
Merge pull request #2713 from kavanLi/master
michaelliao Mar 11, 2018
362a369
the testt of 2pen (#2712)
2pen Mar 11, 2018
d74a5c7
Create jiangerOne (#2711)
jiangerOne Mar 11, 2018
783d5c5
my summary and hope teacher Liao can accept my pull request (#2802)
qazwsx74269 Apr 15, 2018
1b9421d
Personal Thoughts (#2801)
MEShufengRen Apr 15, 2018
1bc8c78
for thanks (#2799)
RexIsMe Apr 15, 2018
14fa88a
感谢廖老师的git教程。 (#2800)
zhuoyan Apr 15, 2018
915e362
learning github
binc4t Apr 16, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions $20170411
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
My pull test
Thank you
!
hello
hello,are you OK ?
8 changes: 8 additions & 0 deletions - -Mr. liao 您好,兰林书- -.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
廖老师,您好
上善若水,水善利万物而不争
明白四达,能无知乎?
i am your new fan bobo

学生:兰林
七星龙井
aaawyc
1 change: 1 addition & 0 deletions - -讲得太好了!帅呆了!.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
谢谢廖老师!讲的太好了!帅呆了!~~
4 changes: 4 additions & 0 deletions - 真的很感谢~.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
真的很感谢廖老师~
看到这么多同学的反馈与感谢我都觉得还是蛮壮观的~
有没有可以一起交流的小伙伴可以互相关注github啊 查看这条的提交者应该就可以了吧
祝老师和同学们以后的每一天都开开心心~测试!!!
5 changes: 5 additions & 0 deletions - 通俗易懂,言辞幽默,非常感谢 -
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
让我试试pull, 接收吧 不枉我学习到那么晚 哈哈


我也试一下
感谢老师!
4 changes: 4 additions & 0 deletions --见字如面.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
真的很感谢廖老师~
看到这么多同学的反馈与感谢我都觉得还是蛮壮观的~
有没有可以一起交流的小伙伴可以互相关注github啊 查看这条的提交者应该就可以了吧
祝老师和同学们以后的每一天都开开心心~测试!!!
151 changes: 151 additions & 0 deletions .000
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
工作区 -> git add -> 暂存区 -> git commit -> 版本库 -> git push -> 远程仓库

版本库HEAD表示当前版本,上一个版本HEAD^,上上一个版本HEAD^^.......

<<<<<<< HEAD

=======
>>>>>>> 2e3ba62650634f2f0a08f9d964b88c846a00c991
配置本机git
git config --global user.name "abcd"
git config --global user.email [email protected]

git连接自己的github
第一步:创建SSH_key: ssh-keygen -t rsa -C "[email protected]",
创建成功后.ssh文件下的id_rsa是私钥,id_rsa.pub是公钥
第二步:登陆GitHub,打开“Account settings”,“SSH Keys”页面
第三步:添加SSH key,用公钥

一切从版本库同步到远程的git都有uname和pword操作push
其他都是从本地直接切换操作

一定要从自己的账号下clone仓库,这样你才能推送修改。先fork再clone

git init 初始化此文件夹为版本库
git add readme.txt 将文件从工作区添加到暂存区
git checkout -- readme.txt 撤销工作区文件的修改
git commit -m "this is commit" 将文件从暂存区提交到版本库
git reset HEAD 从暂存区回退到工作区
git diff 查看工作区文件修改前后的差异
git status 查看工作区与暂存区的文件修改状态
git log 查看提交日志
git log --pretty=oneline
git reset --hard HEAD^ 回退到上一版本
git reflog 查看命令历史
git remote add origin url 为远程Git更名为origin
git push -u origin master 首次推送此次修改
git push origin master 然后可以不加-u
git clone url 克隆一个远程库到本地
git branch page 创建新分支
git checkout page 选择新分支
git checkout -b page 相当于上面两条一起
git branch 查看分支
git merge page 合并分支page到master,checkout到master分支
git merge page --no-ff -m "plain" 禁用Fast forward
git branch -d[D] page 删除分支page,删除前先切换到master分支[D强行删除]
git push origin :page 删除远程分支page
cat read.txt 查看文件内容(冲突)
git log --graph 查看分支合并情况
git log --graph --pretty=oneline --abbrev-commit 查看最近分支合并情况
git stash 隐藏当前工作区
git stath list 查看隐藏的工作区
git stash apply stash{0} 恢复隐藏的工作区,不会删除stash
git stash drop 删除stash
git stash pop stash{0} 恢复隐藏的工作区,一并删除stash
git remote -v 查看远程库信息
git pull 拉取最新分支
git branch --set-upstream branchName origin/branchName 指定本地与远程之间的链接
git tag <name> 可以打一个新标签
git tag 查看所有标签
git tag name id 打标签
-a指定标签名,-m指定说明文字
git show <tagname>可以看到说明文字


有时git clone下来会出现很多branch,更麻烦的是如果主分支没代码那你就只能看到.git目录了。如下面的这个:

$ git clonegit://gitorious.org/android-eeepc/mesa.git


  发现本地就只有一个.git目录,那么这个时候就需要checkout了。

  进入你的本地目录,如这个是mesa,利用

$ git branch –r

  查看branch信息(当然你也可以用git show-branch查看,不过有时并不好用),获得如下branch信息:

origin/android
origin/mesa-es
origin/mesa-es-dri

  此时我们需要的是android分支的代码,那么此时就要进行checkout了。
$ git checkout origin/android

  你再看你的目录(mesa)下是不是有了代码了?其它的branch同理。





git clone默认会把远程仓库整个给clone下来; T2 {0 t, l+ @0 U" C2 g) i
但只会在本地默认创建一个master分支
如果远程还有其他的分支,此时用git branch -a查看所有分支:

* master
remotes/origin/HEAD -> origin/master " A4 u3 ~+ n5 u5 \7 R" Z( d# J
remotes/origin/master
remotes/origin/python_mail.skin
remotes/origin/udisk
remotes/origin/vip
复制代码
能看到远程的所有的分支,如remotes/origin/python_mail.skin e Y' X9 ~, f1 |
可以使用checkout命令来把远程分支取到本地,并自动建立tracking

$ git checkout -b python_mail.skin origin/python_mail.skin) X& X: I3 Q; ?9 j9 T5 @; J/ M
Branch python_mail.skin set up to track remote branch python_mail.skin from origin.; i/ B! ^3 J# u6 a( }. I$ M- i
Switched to a new branch 'python_mail.skin'
复制代码
或者使用-t参数,它默认会在本地建立一个和远程分支名字一样的分支
折叠展开复制代码

$ git checkout -t origin/python_mail.skin
复制代码
也可以使用fetch来做:

$ git fetch origin python_mail.skin:python_mail.skin
复制代码
不过通过fetch命令来建立的本地分支不是一个track branch,而且成功后不会自动切换到该分支上- z) t: R4 p- s6 _2 d3 a
注意:不要在本地采用如下方法:

$ git branch python_mail.skin
$ git checkout python_mail.skin/ i8 z/ N: a% v/ Q: M
$ git pull origin python_mail.skin:python_mail.skin
复制代码
因为,这样建立的branch是以master为基础建立的,再pull下来的话,会和master的内容进行合并,有可能会发生冲突...

Git中从远程的分支获取最新的版本到本地有这样2个命令:
1. git fetch:相当于是从远程获取最新版本到本地,不会自动merge

git fetch origin master
git log -p master..origin/master
git merge origin/master

以上命令的含义:
首先从远程的origin的master主分支下载最新的版本到origin/master分支上
然后比较本地的master分支和origin/master分支的差别
最后进行合并
上述过程其实可以用以下更清晰的方式来进行:
git fetch origin master:tmp
git diff tmp
git merge tmp

从远程获取最新的版本到本地的test分支上
之后再进行比较合并
2. git pull:相当于是从远程获取最新版本并merge到本地
git pull origin master

上述命令其实相当于git fetch 和 git merge
在实际使用中,git fetch更安全一些
因为在merge前,我们可以查看更新情况,然后再决定是否合并
结束
1 change: 1 addition & 0 deletions .3qTeacherLiao.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
刚学会,来玩玩,
Binary file added .DS_Store
Binary file not shown.
Loading