The document discusses various Git commands and processes including local commits, branching, merging, pushing to remote repositories, and handling changes with commands like pull and reset. It outlines detailed workflows for managing branches, pushing changes, and performing merges in a collaborative environment. Important operations like resetting, rebasing, and handling conflicts are also highlighted, along with specifics on command usage.

1. GIT VIZUALIZATION
1

2. INTRODUCTION
WHY?
2

3. LOCAL
git commit
3

4. LOCAL
git commit
3

5. LOCAL
git checkout -b xyz
4
abc
HEAD

6. LOCAL
git checkout -b xyz
4
abc
HEAD
abc
HEAD
xyz

7. LOCAL
git checkout -b xyz
4
abc
HEAD
abc
HEAD
xyz
xyz
HEAD

8. LOCAL
git revert HEAD
5

9. LOCAL
git revert HEAD
5

10. LOCAL
git revert HEAD
5
ADDITIVE
multi-user SAFE

11. ORIGIN (server) LOCAL
ORIGIN (server)
git push ([-u] origin abc:abc)
6

12. ORIGIN (server) LOCAL
ORIGIN (server)
git push ([-u] origin abc:abc)
6

13. GIT VIZUALIZATION
DIGRESSING ON GIT-PUSH
7

14. GIT VIZUALIZATION
DIGRESSING ON GIT-PUSH
▸ git push origin abc:abc
7

15. GIT VIZUALIZATION
DIGRESSING ON GIT-PUSH
▸ git push origin abc:abc
▸ -u | --set-upstream update config of the branch
7

16. GIT VIZUALIZATION
DIGRESSING ON GIT-PUSH
▸ git push origin abc:abc
▸ -u | --set-upstream update config of the branch
▸ git push current branch to its configured remote
7

17. GIT VIZUALIZATION
DIGRESSING ON GIT-PUSH
▸ git push origin abc:abc
▸ -u | --set-upstream update config of the branch
▸ git push current branch to its configured remote
▸ git push abc local abc to its default remote tracking branch
7

18. GIT VIZUALIZATION
DIGRESSING ON GIT-PUSH
▸ git push origin abc:abc
▸ -u | --set-upstream update config of the branch
▸ git push current branch to its configured remote
▸ git push abc local abc to its default remote tracking branch
▸ git push origin abc local abc to default remote abc branch
7

19. GIT VIZUALIZATION
DIGRESSING ON GIT-PUSH
▸ git push origin abc:abc
▸ -u | --set-upstream update config of the branch
▸ git push current branch to its configured remote
▸ git push abc local abc to its default remote tracking branch
▸ git push origin abc local abc to default remote abc branch
▸ git push heroku feat:master feat onto heroku remote master
7

20. GIT VIZUALIZATION
DIGRESSING ON GIT-PUSH
▸ git push origin abc:abc
▸ -u | --set-upstream update config of the branch
▸ git push current branch to its configured remote
▸ git push abc local abc to its default remote tracking branch
▸ git push origin abc local abc to default remote abc branch
▸ git push heroku feat:master feat onto heroku remote master
▸ git push :feat delete default remote feat branch
7

21. GIT VIZUALIZATION
DIGRESSING ON GIT-PUSH
▸ git push origin abc:abc
▸ -u | --set-upstream update config of the branch
▸ git push current branch to its configured remote
▸ git push abc local abc to its default remote tracking branch
▸ git push origin abc local abc to default remote abc branch
▸ git push heroku feat:master feat onto heroku remote master
▸ git push :feat delete default remote feat branch
▸ git push : push to default remote all the branches […]
7

22. LOCAL
git merge abc (develop)
8

23. LOCAL
git merge abc (develop)
8

24. LOCAL
git merge abc (develop)
9

25. LOCAL
git merge abc (develop)
9

26. LOCAL
git merge abc (develop)
9
FAST FORWARD

27. LOCAL
git merge --no-ff abc (develop)
10

28. LOCAL
git merge --no-ff abc (develop)
10

29. ORIGIN (server) LOCAL
LOCAL
git fetch
11
develop
develop
origin/
develop

30. ORIGIN (server) LOCAL
LOCAL
git fetch
11
develop
develop
origin/
develop
origin/
develop
develop

31. ORIGIN (server) LOCAL
LOCAL
git fetch
11
develop
develop
origin/
develop
origin/
develop
develop

32. ORIGIN (server) LOCAL
LOCAL
git fetch
12
develop
develop
origin/
develop
origin/
develop
develop

33. ORIGIN (server) LOCAL
ORIGIN (server)
git push -f (origin develop)
13

34. ORIGIN (server) LOCAL
ORIGIN (server)
git push -f (origin develop)
13
origin/
develop
origin/
abc

35. ORIGIN (server) LOCAL
ORIGIN (server)
git push -f (origin develop)
13
OVERWRITE
origin/
develop
origin/
abc

36. ORIGIN (server) LOCAL
LOCAL
git pull (fetch + merge)
14

37. ORIGIN (server) LOCAL
LOCAL
git pull (fetch + merge)
14
origin/
develop
develop

38. ORIGIN (server) LOCAL
LOCAL
git pull (fetch + merge)
14
origin/
develop
develop

39. ORIGIN (server) LOCAL
LOCAL
git pull
15
develop
origin/
develop

40. ORIGIN (server) LOCAL
LOCAL
git pull
15
develop
origin/
develop

41. ORIGIN (server) LOCAL
LOCAL
git pull
15
develop
origin/
develop

42. ORIGIN (server) LOCAL
LOCAL
git pull
15
develop
origin/
develop

43. ORIGIN (server) LOCAL
LOCAL
git pull --rebase
16

44. ORIGIN (server) LOCAL
LOCAL
git pull --rebase
16

45. ORIGIN (server) LOCAL
LOCAL
git pull --rebase
16
FETCH +
REBASE

46. ORIGIN (server) LOCAL
LOCAL
git pull --rebase
17

47. ORIGIN (server) LOCAL
LOCAL
git pull --rebase
17

48. ORIGIN (server) LOCAL
LOCAL
git pull --rebase
17
FLATTENED

49. ORIGIN (server) LOCAL
LOCAL
git pull --rebase
17
FLATTENED
CONFLICTS
AGAIN

50. ORIGIN (server) LOCAL
LOCAL
git reset --hard origin/develop
18
develop
origin/
develop
def

51. ORIGIN (server) LOCAL
LOCAL
git reset --hard origin/develop
18
develop
origin/
develop
def
develop
origin/
develop
def

52. ORIGIN (server) LOCAL
LOCAL
git reset --hard origin/develop
18
develop
origin/
develop
def
develop
origin/
develop
def
not easily
accessible

53. ORIGIN (server) LOCAL
LOCAL
git reset --hard origin/develop
18
develop
origin/
develop
def
develop
origin/
develop
def
not easily
accessible
SHA1
develop@{1}

54. ORIGIN (server) LOCAL
LOCAL
git reset --hard origin/develop
18
develop
origin/
develop
def
develop
origin/
develop
def
not easily
accessible
SHA1
develop@{1}
will be garbage
collected

55. ORIGIN (server) LOCAL
LOCAL
git reset --hard origin/develop
18
develop
origin/
develop
def
develop
origin/
develop
def
LOCAL
CHANGES
LOST
not easily
accessible
SHA1
develop@{1}
will be garbage
collected

56. ORIGIN (server) LOCAL
LOCAL
git branch -f develop origin/develop
19
develop
origin/
develop
def
develop
origin/
develop
def
LOCAL
CHANGES
LOST
not easily
accessible
SHA1
develop@{1}
will be garbage
collected

57. ORIGIN (server) LOCAL
LOCAL
git rebase origin/develop
20
develop

58. ORIGIN (server) LOCAL
LOCAL
git rebase origin/develop
20
develop
develop

59. ORIGIN (server) LOCAL
LOCAL
git rebase origin/develop
20
origin/
develop
develop
develop

60. ORIGIN (server) LOCAL
LOCAL
git rebase origin/develop
21
develop
origin/
develop
def

61. ORIGIN (server) LOCAL
LOCAL
git rebase origin/develop
21
develop
origin/
develop
develop
origin/
develop
def
def

62. LOCAL
git rebase -i develop
22

63. LOCAL
git rebase -i develop
22

64. LOCAL
git rebase -i develop
22

65. LOCAL
git rebase -i develop
22

66. LOCAL
git rebase -i develop
22

67. LOCAL
git rebase -i develop
22

68. LOCAL
git rebase -i develop
22

69. LOCAL
git rebase -i develop
22

70. LOCAL
git rebase -i develop
22

71. 23REBASE WITH AN ANCHOR

72. 23REBASE WITH AN ANCHOR

73. 23REBASE WITH AN ANCHOR

74. 23REBASE WITH AN ANCHOR
git rebase --onto …

75. 23REBASE WITH AN ANCHOR
git rebase --onto …

76. 23REBASE WITH AN ANCHOR
git rebase --onto …

77. 24

78. 24

79. ROTI

80. 26
Grégory Bataille
@gregbfiveten
Pix4D
Back end engineer
Photogrammetry