Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git Workflows

Git Workflows

Radoslav Stankov

October 19, 2018
Tweet

More Decks by Radoslav Stankov

Other Decks in Technology

Transcript

  1. Radoslav Stankov 18/10/2018
    Improving Your
    Workflows

    View Slide

  2. Radoslav Stankov
    @rstankov

    blog.rstankov.com

    github.com/rstankov

    twitter.com/rstankov

    View Slide

  3. View Slide

  4. View Slide

  5. View Slide

  6. View Slide

  7. View Slide

  8. View Slide

  9. View Slide

  10. View Slide

  11. View Slide

  12. =
    !

    View Slide

  13. View Slide

  14. View Slide

  15. View Slide

  16. View Slide

  17. View Slide

  18. Git: Under the hooh

    View Slide

  19. cd .git

    View Slide

  20. refs/
    objects/
    logs/
    hooks/
    index
    HEAD
    config
    COMMIT_EDITMSG

    View Slide

  21. refs/
    objects/
    logs/
    hooks/
    index
    HEAD
    config
    COMMIT_EDITMSG

    View Slide

  22. "Git just object database
    + some shell scripts"

    View Slide

  23. View Slide

  24. Content

    View Slide

  25. Content
    Type + ' ' + Size + \0
    Content

    View Slide

  26. Content
    Type + ' ' + Size + \0
    Content
    SHA1 digest

    bbd51c3fa6ccabc8e3bf955958...

    View Slide

  27. Content
    Type + ' ' + Size + \0
    Content
    SHA1 digest

    bbd51c3fa6ccabc8e3bf955958...
    .git/objects/bb/d51c3fa6ccabc8e3bf9559cd0af21558995d3f

    View Slide

  28. Content
    Type + ' ' + Size + \0
    Content
    SHA1 digest

    bbd51c3fa6ccabc8e3bf955958...
    .git/objects/bb/d51c3fa6ccabc8e3bf9559cd0af21558995d3f

    View Slide

  29. Content
    Type + ' ' + Size + \0
    Content
    SHA1 digest

    bbd51c3fa6ccabc8e3bf955958...
    .git/objects/bb/d51c3fa6ccabc8e3bf9559cd0af21558995d3f

    View Slide

  30. bbd51c
    bbd51c3fa
    bbd51c3fa6ccab
    bbd51c3fa6ccabc8e3bf95
    bbd51c3fa6ccabc8e3bf9559cd0af21558995d3f

    .git/objects/bb/d51c3fa6ccabc8e3bf9559cd0af21558995d3f


    View Slide

  31. Commit
    Tree
    Blob

    Main Object Types


    View Slide

  32. Commit
    Tree
    Blob

    Main Object Types


    View Slide


  33. Blob


    View Slide


  34. Blob

    export function toggleTopicFollow(topicId: number): Dispatchable {
    return function(dispatch: Dispatch, getState: Function, api: any): void {
    const { currentUser } = getState();
    if (isFollowingTopic(currentUser, id)) {
    api.topics.followers.delete({ topicId });
    dispatch({ type: UNFOLLOW_TOPIC, payload: { topicId } });
    } else {
    api.topics.followers.create({ topicId });
    dispatch({ type: FOLLOW_TOPIC, payload: { topicId } });
    }
    };
    }

    View Slide

  35. Commit
    Tree
    Blob

    Main Object Types


    View Slide


  36. Tree

    client/
    server/
    README.md

    View Slide


  37. Tree

    Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)

    View Slide

  38. Tree
    100644 blob a906cb2a4a904a152e80877d4088654daad0c859 README.md
    040000 blob 8f94139338f9404f26296befa88755fc2598c289 client/
    040000 tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 server/

    Tree


    View Slide

  39. Tree
    100644 blob a906cb2a4a904a152e80877d4088654daad0c859 README.md
    040000 blob 8f94139338f9404f26296befa88755fc2598c289 client/
    040000 tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 server/
    mode

    Tree


    View Slide

  40. Tree
    100644 blob a906cb2a4a904a152e80877d4088654daad0c859 README.md
    040000 blob 8f94139338f9404f26296befa88755fc2598c289 client/
    040000 tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 server/

    Tree


    View Slide

  41. Tree
    100644 blob a906cb2a4a904a152e80877d4088654daad0c859 README.md
    040000 blob 8f94139338f9404f26296befa88755fc2598c289 client/
    040000 tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 server/
    type

    Tree


    View Slide

  42. Tree
    100644 blob a906cb2a4a904a152e80877d4088654daad0c859 README.md
    040000 blob 8f94139338f9404f26296befa88755fc2598c289 client/
    040000 tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 server/

    Tree


    View Slide

  43. Tree
    100644 blob a906cb2a4a904a152e80877d4088654daad0c859 README.md
    040000 blob 8f94139338f9404f26296befa88755fc2598c289 client/
    040000 tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 server/
    ref

    Tree


    View Slide

  44. Tree
    100644 blob a906cb2a4a904a152e80877d4088654daad0c859 README.md
    040000 blob 8f94139338f9404f26296befa88755fc2598c289 client/
    040000 tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 server/

    Tree


    View Slide

  45. Tree
    100644 blob a906cb2a4a904a152e80877d4088654daad0c859 README.md
    040000 blob 8f94139338f9404f26296befa88755fc2598c289 client/
    040000 tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 server/
    name

    Tree


    View Slide

  46. Tree
    100644 blob a906cb2a4a904a152e80877d4088654daad0c859 README.md
    040000 blob 8f94139338f9404f26296befa88755fc2598c289 client/
    040000 tree 99f1a6d12cb4b6f19c8655fca46c3ecf317074e0 server/

    Tree


    View Slide

  47. Commit
    Tree
    Blob

    Main Object Types


    View Slide


  48. Commit


    View Slide


  49. Commit

    Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)

    View Slide


  50. Commit

    Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)

    View Slide


  51. Commit

    Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit

    View Slide


  52. Commit

    Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Commit

    (parent)

    View Slide

  53. Commit
    Tree a906cb2a4a904a152e80877d4088654daad0c859
    Parent 8f94139338f9404f26296befa88755fc2598c289
    Author Radoslav Stankov 123242
    Date Sat May 5 18:09:34 2018 -0700

    Commit


    View Slide

  54. Commit
    Tree
    Blob

    Main Object Types


    View Slide

  55. Commit
    Tree
    Blob

    Main Object Types


    View Slide

  56. Commit
    Tree
    Blob

    Main Object Types


    View Slide

  57. Commit
    Tree
    Blob

    Main Object Types


    View Slide

  58. Commit
    Tree
    Blob

    Main Object Types


    View Slide

  59. Content
    Type + ' ' + Size + \0
    Content
    SHA1 digest

    bbd51c3fa6ccabc8e3bf955958...
    .git/objects/bb/d51c3fa6ccabc8e3bf9559cd0af21558995d3f

    View Slide

  60. Type + ' ' + Size + \0
    Content
    SHA1 digest

    bbd51c3fa6ccabc8e3bf955958...
    .git/objects/bb/d51c3fa6ccabc8e3bf9559cd0af21558995d3f
    Commit
    Tree
    Blob

    View Slide

  61. Type + ' ' + Size + \0
    Content
    SHA1 digest

    bbd51c3fa6ccabc8e3bf955958...
    .git/objects/bb/d51c3fa6ccabc8e3bf9559cd0af21558995d3f
    Commit
    Tree
    Blob

    View Slide

  62. Commit
    Tree
    Blob

    Main Object Types


    View Slide

  63. Commit
    Tree
    Blob

    Main Object Types


    View Slide

  64. refs/
    objects/
    logs/
    hooks/
    index
    HEAD
    config
    COMMIT_EDITMSG

    View Slide

  65. refs/
    objects/
    logs/
    hooks/
    index
    HEAD
    config
    COMMIT_EDITMSG

    View Slide

  66. "Refs are basically
    pointers to commit"

    View Slide

  67. Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit

    View Slide

  68. Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit

    View Slide

  69. Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Ref

    (mater)

    View Slide

  70. Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Ref

    (HEAD)
    Ref

    (mater)

    View Slide

  71. Tag 

    (v1)
    Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Ref

    (HEAD)
    Ref

    (mater)

    View Slide

  72. Tag 

    (v1)
    Ref

    (remote/master)
    Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Ref

    (HEAD)
    Ref

    (mater)

    View Slide

  73. Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Ref

    (mater)
    Tag 

    (v1)
    Ref

    (remote/master)
    Ref

    (HEAD)

    View Slide

  74. Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Ref

    (HEAD)
    Ref

    (mater)

    View Slide

  75. Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Ref

    (HEAD)

    View Slide

  76. Tree
    Blob
    (/README.md)
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Ref

    (HEAD)
    Commit
    Tree
    Blob
    (/README.md)

    View Slide

  77. Tree
    Tree
    (/client/)
    Tree
    (/server/)
    Commit
    Ref

    (HEAD)
    Commit
    Tree
    Blob
    (/README.md)
    Commit
    Tree

    View Slide

  78. View Slide

  79. git clone
    git add
    git commit
    git status
    git fetch
    git push
    git pull
    git checkout
    git branch
    git log

    git diff

    Main Git Commands


    View Slide


  80. Main Git Commands

    Remote
    Local
    Staging
    Unstaged

    View Slide


  81. Main Git Commands

    Remote
    Local
    Staging
    Unstaged
    git add

    View Slide


  82. Main Git Commands

    Remote
    Local
    Staging
    Unstaged
    git add
    git commit

    View Slide


  83. Main Git Commands

    Remote
    Local
    Staging
    Unstaged
    git add
    git commit
    git push

    View Slide


  84. Main Git Commands

    Remote
    Local
    Staging
    Unstaged
    git add
    git commit
    git push
    git pull

    View Slide


  85. Main Git Commands

    Remote
    Local
    Staging
    Unstaged
    git add
    git commit
    git push
    git pull
    git checkout

    View Slide

  86. refs/
    objects/
    logs/
    hooks/
    index
    HEAD
    config
    COMMIT_EDITMSG

    View Slide

  87. Merge Rebase

    View Slide

  88. Master Commit M1

    View Slide

  89. Master
    Commit M1
    Commit M2
    Commit M3

    View Slide

  90. Master Branch
    Commit M1
    Commit M2
    Commit M3

    View Slide

  91. Master
    Branch
    Commit M1
    Commit M2
    Commit M3
    Commit M4

    View Slide

  92. Master
    Branch
    Commit M1
    Commit M2
    Commit M3
    Commit M4
    Commit B1

    View Slide

  93. Master
    Branch
    Commit M1
    Commit M2
    Commit M3
    Commit M4
    Commit B1
    Commit B2
    Commit B3
    Commit B4

    View Slide

  94. Master Branch
    Commit M1
    Commit M2
    Commit M3
    Commit M4
    Commit M5
    Commit M6
    Commit B1
    Commit B2
    Commit B3
    Commit B4

    View Slide


  95. git merge [branch]

    Master
    Branch
    Commit M1
    Commit M2
    Commit M3
    Commit M4
    Commit M5
    Commit M6
    Merge Commit
    Commit B1
    Commit B2
    Commit B3
    Commit B4

    View Slide

  96. Master Branch
    Commit M1
    Commit M2
    Commit M3
    Commit M4
    Commit M5
    Commit M6
    Commit B1
    Commit B2
    Commit B3
    Commit B4

    git rebase master [branch]


    View Slide

  97. Branch
    Master
    Commit M1
    Commit M2
    Commit M3
    Commit M4
    Commit M5
    Commit M6
    Commit B1
    Commit B2
    Commit B3
    Commit B4

    git rebase master [branch]


    View Slide

  98. Branch
    Master
    Commit M5
    Commit M6
    Commit B1
    Commit B2
    Commit B3
    Commit B4

    git rebase master [branch]


    View Slide

  99. Branch
    Master
    Commit M5
    Commit M6
    Commit B1
    Commit B2
    Commit B3
    Commit B4

    git rebase master [branch]


    View Slide

  100. Branch
    Master
    Commit M5
    Commit M6
    Commit B1x
    Commit B2
    Commit B3
    Commit B4

    git rebase master [branch]


    View Slide

  101. Branch
    Master
    Commit M5
    Commit M6
    Commit B1x
    Commit B2x
    Commit B3x
    Commit B4x

    git rebase master [branch]


    View Slide

  102. Branch
    Master
    Commit M5
    Commit M6
    Commit B1x
    Commit B2x
    Commit B3x
    Commit B4x

    git merge [branch] 


    View Slide

  103. Improve your tools

    View Slide

  104. ~/.gitconfig

    View Slide

  105. [alias]
    st = status
    br = branch
    co = checkout

    https://github.com/RStankov/config_files/blob/master/dot/gitconfig


    View Slide

  106. [alias]
    stahs = stash
    puhs = push
    hsow = show

    https://github.com/RStankov/config_files/blob/master/dot/gitconfig


    View Slide

  107. [alias]
    stahs = stash
    puhs = push
    hsow = show

    https://github.com/RStankov/config_files/blob/master/dot/gitconfig

    "

    View Slide

  108. alias ga="git add -A"
    alias gp="git pull --rebase"
    alias grc="git add .; git rebase --continue"
    alias gr="git rebase -i"
    alias gs="git stash"
    alias gco="git checkout"
    alias gl="git lol"
    alias gd="git diff"
    alias gdc="git diff --cached"
    alias gst="git status"

    https://github.com/RStankov/config_files/blob/master/dot/zsh/aliases


    View Slide

  109. [alias]
    ls = ls-files
    undo = reset --soft HEAD^
    amend = commit --amend
    unstage = reset HEAD

    https://github.com/RStankov/config_files/blob/master/dot/gitconfig


    View Slide

  110. [alias]
    lol = log --graph --decorate --
    pretty='format:%C(yellow)%h%Cgreen%d%Creset
    %s %C(white) (%an, %ar)%Creset' --abbrev-
    commit
    today = log --stat --since='1 Day Ago' --
    graph --pretty=oneline --abbrev-commit --
    date=relative

    https://github.com/RStankov/config_files/blob/master/dot/gitconfig


    View Slide


  111. git lol


    View Slide


  112. git today


    View Slide

  113. ~/bin/git-***

    View Slide

  114. ~/bin/git-pull-request

    View Slide


  115. https://github.com/RStankov/config_files/blob/master/bin/git-pull-request

    #!/bin/bash
    current_branch=`git rev-parse --abbrev-ref HEAD`
    remote_url=`git remote get-url origin | awk '{gsub(/
    [email protected]:/,"")}1' | awk '{gsub(/\.git/,"")}1'`
    git push origin $current_branch --set-upstream
    open https://github.com/$remote_url/compare/$current_branch

    git pull-request


    View Slide

  116. ~/bin/rebase-on-master

    View Slide


  117. https://github.com/RStankov/config_files/blob/master/bin/git-rebase-on-master

    #!/bin/bash
    current_branch=`git rev-parse --abbrev-ref HEAD`
    git checkout master
    git pull origin master --rebase
    git rebase master $current_branch

    git rebase-on-master


    View Slide

  118. ~/bin/delete-merged

    View Slide


  119. https://github.com/RStankov/config_files/blob/master/bin/git-delete-merged

    #!/bin/bash
    current_branch=`git rev-parse --abbrev-ref HEAD`
    git checkout master
    git pull origin master --rebase
    git rebase master $current_branch

    git delete-merged


    View Slide

  120. GUI

    View Slide


  121. Fork


    https://git-fork.com


    View Slide


  122. https://git-fork.com


    View Slide

  123. "I only use Git GUI to
    stage files to commits
    and amending previous
    commits"

    View Slide


  124. https://git-fork.com


    View Slide


  125. https://git-fork.com


    View Slide

  126. View Slide

  127. Thanks #

    View Slide