Każdy developer zna Gita lub przynajmniej słyszał o nim. Oferuje on wiele możliwości, które pozwalają na tworzenie pełnej historii kodu w projekcie. Aby jednak historia była przyjazna i przejrzysta, dobrze jest stosować kilka zasad podczas korzystania z Gita. W czasie prezentacji przedstawię te zasady i omówię kilka sposobów na efektywne wykorzystanie tego systemu kontroli wersji do trzymania historii "w ryzach".

1. Keep your GIT history
clean
Tomasz Brodziński
@TomaszBro

3. Commit message – formating and limitations

4. First line as summary of changes
● max 50 characters
● begin with a capital letter
● no period at the end
● imperative mood

5. Detailed description
● empty line
● “what”, “why” not “how”
● wrap at 72 characters
● markup syntax

6. Examples of good git repositories
● Git (https://github.com/git/git/commits/master)
● Linux kernel (https://github.com/torvalds/linux/commits/master)
● Spring Boot
(https://github.com/spring-projects/spring-boot/commits/master)

8. > git commit --amend
Modifying last commit

10. Undo last commits
> git reset <commit>
> git reset --hard <commit>

12. Undo commit
> git revert <commit>

13. Three-way merge
C1 C5C2
C3 C4
C6
feature
C7
master

14. Rebasing
C1 C5C2
master
C3 C4
C6
feature

15. Rebasing
C1 C5C2
master
C6
> git rebase master
C3' C4'
feature
C3 C4
feature

16. Interactive rebasing
> git rebase -i HEAD~5

18. Interactive rebasing
modifying commit message
pick a2936e8 commit 1
reword 8f6e450 commit 2
pick dabb0ef commit 3
pick ef5a182 commit 4
pick 4df80af commit 5

19. Interactive rebasing
editing commit
pick a2936e8 commit 1
pick 4ef5850 new message
edit dabb0ef commit 3
pick ef5a182 commit 4
pick 4df80af commit 5

20. Rebasing
> git rebase --skip
> git rebase --continue
> git rebase --abort

21. Interactive rebasing
removing commit
pick a2936e8 commit 1
pick 4ef5850 new message
pick dabb0ef commit 3
pick ef5a182 commit 4
pick 4df80af commit 5

22. Interactive rebasing
squash commits
pick a2936e8 commit 1
pick 4ef5850 new message
squash a733bfe edited commit
pick 4df80af commit 5

23. Interactive rebasing
fixup commit
pick a2936e8 commit 1
pick e95fadc squashed commit
pick 4df80af commit 5
fixup 865ef03 commit 6
pick 4ee98c2 commit 7

24. Interactive rebasing
fixup commit
pick a2936e8 commit 1
fixup 865ef03 commit 6
pick e95fadc squashed commit
pick 4df80af commit 5
pick 4ee98c2 commit 7

25. Interactive rebasing
running shell command
pick 37ef6a3 commit 1
pick e95fadc squashed commit
exec make test
pick 4df80af commit 5
exec cd subdir; make test
pick 4ee98c2 commit 7

26. Fixup commit
> git commit --fixup=4df80af

27. Fixup commit
> git rebase -i --autosquash HEAD~5
pick a2936e8 commit 1
pick e95fadc squashed commit
pick 4df80af commit 5
fixup 723de73 fixup! commit 5
pick 4ee98c2 commit 7

28. Squash commit
> git commit --squash=a2936e8

29. Squash commit
> git rebase -i --autosquash HEAD~5
pick a2936e8 commit 1
squash 723de73 squash! commit 1
pick e95fadc squashed commit
pick 4df80af commit 5
pick 4ee98c2 commit 7

31. Reflog
> git reflog
8a8fa91 HEAD@{0}: merge branch1: Merge made by the
'recursive' strategy.
ddae7c1 HEAD@{1}: checkout: moving from branch1 to master
50465c0 HEAD@{2}: commit: Commit 4
ddae7c1 HEAD@{3}: commit: Commit 3
f15e834 HEAD@{4}: commit: My commit 2
4df80af HEAD@{5}: checkout: moving from master to branch1
4df80af HEAD@{6}: commit (initial): My first commit

32. Reflog
> git reset --hard HEAD@{3}

33. IDE vs terminal

34. Git log - filtering
> git log --grep <search>
> git log --before <date>
> git log --after <date>
> git log --author <author name>
> git log <origin>..<branch>

35. Git log - formating
> git log
> git log --oneline
> git log --graph
> git log --decorate
> git log --oneline --graph --decorate

37. Thank you!