Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Git 常用的指令和定義

Git操作

1. $ git log

2. commit 65901b6c3d9b366788ceffd9c6905b12e34d7068 (HEAD -> a1)

3. Author: Burning Teng <2250911301@qq.com>

4. Date: ? Thu Jan 2 22:33:56 2020 +0800

5. 
   

6. ? ?a1*4

7. 
   

8. commit dbc6f316e6b3c3c23905fe2b8035a3acafe9d4b3

9. Author: Burning Teng <2250911301@qq.com>

10. Date: ? Thu Jan 2 22:32:26 2020 +0800

11. 
    

12. ? ?a1*3

13. 
    

14. commit e93ff79c9c9a4fd7de4938fdcf128923a3eb669a

15. Author: Burning Teng <2250911301@qq.com>

16. Date: ? Thu Jan 2 22:31:09 2020 +0800

17. 
    

18. ? ?a1*2

19. 
    

20. commit fe3f58bec8a08ea618f65a87c70ec72d507c2e0a (master)

21. Author: Burning Teng <2250911301@qq.com>

22. Date: ? Thu Jan 2 01:10:59 2020 +0800

23. 
    

24. ? ?a1+a1

25. 
    

26. ? ?a1+a1+a1

27. 
    

28. ? ?a1+a1+a1+a1

29. 
    

30. ? ?a1+a1+a1+a1+a1

31. 
    

32. ? ?a1*6

33. 
    

34. ? ?a1*4

35. 
    

36. commit 6e8da3d08c7f008eb8f9702f3ee970c90b37325b

37. Author: Burning Teng <2250911301@qq.com>

38. Date: ? Thu Jan 2 01:10:27 2020 +0800

39. 
    

40. ? ?a1

無論是修改commit的順序還是修改commit信息，commit對應(yīng)的文件信息等，都可以使用git rebase -i 來完成。

1. $ git rebase -i 6e8da3d08c7f008eb8f9702f3ee970c90b37325b

2. [detached HEAD e5f7eae] a1 no2

3. Date: Thu Jan 2 01:10:59 2020 +0800

4. 1 file changed, 1 insertion(+), 1 deletion(-)

5. Stopped at e93ff79... ?a1*2

6. You can amend the commit now, with

7. 
   

8. ?git commit --amend

9. 
   

10. Once you are satisfied with your changes, run

11. 
    

12. ?git rebase --continue

13. 
    

14. Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)

15. $ git branch

16. * (no branch, rebasing a1)

17. ?a1

18. ?master

19. 
    

20. Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)

21. $ ls

22. a.txt

23. 
    

24. Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)

25. $ vi a.txt

26. 
    

27. Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)

28. $ git commit --amend

29. [detached HEAD 43cccc5] a1*2 no3

30. Date: Thu Jan 2 22:31:09 2020 +0800

31. 1 file changed, 1 insertion(+), 1 deletion(-)

32. 
    

33. Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)

34. $ git branch

35. * (no branch, rebasing a1)

36. ?a1

37. ?master

38. 
    

39. Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)

40. $ git status

41. interactive rebase in progress; onto 6e8da3d

42. Last commands done (2 commands done):

43. ? reword fe3f58b a1+a1

44. ? edit e93ff79 a1*2

45. Next commands to do (2 remaining commands):

46. ? pick dbc6f31 a1*3

47. ? pick 65901b6 a1*4

48. ?(use "git rebase --edit-todo" to view and edit)

49. You are currently editing a commit while rebasing branch 'a1' on '6e8da3d'.

50. ?(use "git commit --amend" to amend the current commit)

51. ?(use "git rebase --continue" once you are satisfied with your changes)

52. 
    

53. nothing to commit, working tree clean

54. 
    

55. Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)

56. $ git rebase --continue

57. Successfully rebased and updated refs/heads/a1.

58. 
    

59. Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1)

60. $ git log --oneline

61. 22894ce (HEAD -> a1) a1*4

62. 56fec42 a1*3

63. 43cccc5 a1*2 no3

64. e5f7eae a1 no2

65. 6e8da3d a1

Git補充指令

git remote rm origin

公眾號