Git workflow for time travelers

Slides about git history changing. CocoaHeads Dnepropetrovsk, 26 of March, 2016.

Transcript

1. @Berk0ld #cocoaheads #dnepr GIT WORKFLOW FOR TIME TRAVELLERS by Andrey Moskvin
2. @Berk0ld #cocoaheads #dnepr 2 GOALS Clean and ‘easy-to-navigate’ history Simplify code review
3. @Berk0ld #cocoaheads #dnepr 3 INSTRUMENTS REBASE FORCE PUSH
4. @Berk0ld #cocoaheads #dnepr 4 CONSTRAINTS - 1 developer works on 1 feature branch - No force push on master branch Safety:
5. @Berk0ld #cocoaheads #dnepr REBASE
6. @Berk0ld #cocoaheads #dnepr INTERACTIVE REBASE git rebase —interactive new_base_branch git rebase —interactive commit_hash or
7. @Berk0ld #cocoaheads #dnepr 2. git rebase -i master LET’S START! 1. Current branch - feature/cleanup 3. List of commits:
8. @Berk0ld #cocoaheads #dnepr ACTIONS p, pick = use commit r, reword = use commit, but edit the commit message e, edit = use commit, but stop for amending s, squash = use commit, but meld into previous commit f, fixup = like "squash", but discard this commit's log message x, exec = run command (the rest of the line) using shell d, drop = remove commit
9. @Berk0ld #cocoaheads #dnepr NICE COMMIT MESSAGE Capitalised, short (50 chars or less) summary More detailed explanatory text, if necessary. Wrap it to about 72 characters or so.
10. @Berk0ld #cocoaheads #dnepr FORCE PUSH git push —force
11. @Berk0ld #cocoaheads #dnepr REPOSITORY STATE Before After
12. LINKS ▸ Git Flow (http://nvie.com/posts/a-successful-git-branching-model/) ▸ GitHub Flow (http://scottchacon.com/2011/08/31/github-flow.html) ▸ GitLab Flow (https://about.gitlab.com/2014/09/29/gitlab-flow/ ) ▸ Rebase (https://habrahabr.ru/post/161009/) ▸ Nice commit message style (http://tbaggery.com/2008/04/19/a- note-about-git-commit-messages.html) ▸ Thoughtbot (https://robots.thoughtbot.com/5-useful-tips-for-a- better-commit-message)
13. TOOLS ▸ GitUp (http://gitup.co) ▸ oh my zsh!(https://github.com/robbyrussell/oh-my-zsh) ▸ Atom (https://atom.io)
 Setting default git editor (https://help.github.com/articles/ associating-text-editors-with-git/)
14. THAT’S ALL FOLKS! THATS ALL! THANK YOU FOR ATTENTION! P.S. Thanks Alexey Demedeckiy (@DAloog) for help in preparing this material. Skype: berkold E- mail: berkold90@gmail.com