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

Introduction to Git

Introduction to Git

My 1 hour intro to Git

Scott Chacon

November 25, 2011
Tweet

More Decks by Scott Chacon

Other Decks in Programming

Transcript

  1. Me

  2. File Checkout Version Database Version 3 Version 2 Version 1

    Central VCS Server Computer A File Checkout Computer B
  3. Version Database Version 3 Version 2 Version 1 Server Computer

    File Computer A Version Database Version 3 Version 2 Version 1 File Computer B Version Database Version 3 Version 2 Version 1
  4. No Network Needed Performing a diff Viewing file history Committing

    changes Merging branches Obtaining other revisions of a file
  5. No Network Needed Performing a diff Viewing file history Committing

    changes Merging branches Obtaining other revisions of a file Switching branches
  6. No Network Needed Performing a diff Viewing file history Committing

    changes Merging branches Obtaining other revisions of a file Switching branches
  7. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } README.txt hello.c hola.c
  8. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } README.txt hello.c hola.c
  9. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } README.txt hello.c hola.c
  10. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } README.txt hello.c hola.c #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B README.txt hello.c hola.c
  11. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B README.txt hello.c hola.c
  12. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B README.txt hello.c hola.c
  13. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B README.txt hello.c hola.c hola.c
  14. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B Commit C README.txt hello.c hola.c (rename)
  15. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B Commit C README.txt hello.c hola.c (rename)
  16. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hola project. Licensed under GPL. README.txt hola.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy) #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } hello.c #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B Commit C README.txt hello.c hola.c (rename)
  17. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hola project. Licensed under GPL. README.txt hola.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy) #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } hello.c #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B Commit C README.txt hello.c hola.c (rename)
  18. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hola project. Licensed under GPL. README.txt hola.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy) #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } hello.c
  19. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13
  20. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 CHECKSUM
  21. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 CHECKSUM
  22. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13
  23. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13
  24. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13
  25. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13
  26. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13
  27. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c
  28. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c
  29. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c
  30. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hello.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c
  31. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c
  32. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c
  33. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c
  34. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c
  35. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c
  36. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c
  37. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hello project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c
  38. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hola project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c This is Scott's Hola project. Licensed under GPL. 84f #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } hello.c
  39. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hola project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c This is Scott's Hola project. Licensed under GPL. 84f #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } hello.c
  40. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hola project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c This is Scott's Hola project. Licensed under GPL. 84f #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } hello.c
  41. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hola project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c This is Scott's Hola project. Licensed under GPL. 84f Commit D 84f README.txt 6d4 hola.c 6d4 hello.c #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } hello.c
  42. #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } This is

    Scott's Hola project. Licensed under GPL. README.txt hola.c Commit A c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c This is Scott's Hola project. Licensed under GPL. 84f Commit D 84f README.txt 6d4 hola.c 6d4 hello.c #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } hello.c
  43. Commit A This is Scott's Hello project. Licensed under GPL.

    #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy)
  44. Commit A c3d README.txt f13 hello.c This is Scott's Hello

    project. Licensed under GPL. c3d #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } f13 #include<stdio.h> int main(void) { printf("Hola\n"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c This is Scott's Hola project. Licensed under GPL. 84f Commit D 84f README.txt 6d4 hola.c 6d4 hello.c Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } - printf("Hola\n"); + printf("Hola\n"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy)
  45. $ touch hello_world.rb $ git init $ git add .

    $ git commit -m ‘first commit’
  46. $ touch hello_world.rb $ git init $ git add .

    $ git commit -m ‘first commit’
  47. $ tree -a . |-- .git | |-- HEAD |

    |-- branches | |-- config | |-- description | |-- hooks | | |-- post-commit.sample | | |-- post-receive.sample | | |-- ... | | |-- pre-rebase.sample | | `-- update.sample | |-- info | | `-- exclude | |-- objects | | |-- info | | `-- pack | |-- refs | | |-- heads | | `-- tags | `-- remotes `-- hello_world.rb 11 directories, 25 files
  48. $ tree -a . |-- .git | |-- HEAD |

    |-- branches | |-- config | |-- description | |-- hooks | | |-- post-commit.sample | | |-- post-receive.sample | | |-- ... | | |-- pre-rebase.sample | | `-- update.sample | |-- info | | `-- exclude | |-- objects | | |-- info | | `-- pack | |-- refs | | |-- heads | | `-- tags | `-- remotes `-- hello_world.rb 11 directories, 25 files
  49. $ tree -a . |-- .git | |-- HEAD |

    |-- branches | |-- config | |-- description | |-- hooks | | |-- post-commit.sample | | |-- post-receive.sample | | |-- ... | | |-- pre-rebase.sample | | `-- update.sample | |-- info | | `-- exclude | |-- objects | | |-- info | | `-- pack | |-- refs | | |-- heads | | `-- tags | `-- remotes `-- hello_world.rb 11 directories, 25 files
  50. $ touch hello_world.rb $ git init $ git add .

    $ git commit -m ‘first commit’
  51. $ touch hello_world.rb $ git init $ git add .

    $ git commit -m ‘first commit’
  52. $ tree -a . |-- .git | |-- COMMIT_EDITMSG |

    |-- HEAD | |-- branches | |-- config | |-- description | |-- hooks | | |-- applypatch-msg.sample | | `-- update.sample | |-- index | |-- info | | `-- exclude | |-- logs | | |-- HEAD | | `-- refs | | `-- heads | | `-- master | |-- objects | | |-- 32/09658ac8d80bc9726d3a33d77e3dfc5fe6035e | | |-- 53/9cd7886a627841d525a78d45cbc6396be20b41 | | |-- e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | | |-- info | | `-- pack | |-- refs | | |-- heads | | | `-- master | | `-- tags | `-- remotes `-- hello_world.rb 17 directories, 33 files
  53. $ tree -a . |-- .git | |-- COMMIT_EDITMSG |

    |-- HEAD | |-- branches | |-- config | |-- description | |-- hooks | | |-- applypatch-msg.sample | | `-- update.sample | |-- index | |-- info | | `-- exclude | |-- logs | | |-- HEAD | | `-- refs | | `-- heads | | `-- master | |-- objects | | |-- 32/09658ac8d80bc9726d3a33d77e3dfc5fe6035e | | |-- 53/9cd7886a627841d525a78d45cbc6396be20b41 | | |-- e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | | |-- info | | `-- pack | |-- refs | | |-- heads | | | `-- master | | `-- tags | `-- remotes `-- hello_world.rb 17 directories, 33 files
  54. $ tree -a . |-- .git | |-- COMMIT_EDITMSG |

    |-- HEAD | |-- branches | |-- config | |-- description | |-- hooks | | |-- applypatch-msg.sample | | `-- update.sample | |-- index | |-- info | | `-- exclude | |-- logs | | |-- HEAD | | `-- refs | | `-- heads | | `-- master | |-- objects | | |-- 32/09658ac8d80bc9726d3a33d77e3dfc5fe6035e | | |-- 53/9cd7886a627841d525a78d45cbc6396be20b41 | | |-- e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | | |-- info | | `-- pack | |-- refs | | |-- heads | | | `-- master | | `-- tags | `-- remotes `-- hello_world.rb 17 directories, 33 files
  55. $ git clone git://github.com/schacon/ticgit.git Initialized empty Git repository in /private/tmp/ticgit/.git/

    remote: Counting objects: 591, done. remote: Compressing objects: 100% (267/267), done. remote: Total 591 (delta 253), reused 587 (delta 252) Receiving objects: 100% (591/591), 73.05 KiB, done. Resolving deltas: 100% (253/253), done. $ cd ticgit/ $ ls LICENSE! ! Rakefile! examples! note! ! ticgit.gemspec README! ! bin! ! lib! ! spec $
  56. $ git clone git://github.com/schacon/ticgit.git Initialized empty Git repository in /private/tmp/ticgit/.git/

    remote: Counting objects: 591, done. remote: Compressing objects: 100% (267/267), done. remote: Total 591 (delta 253), reused 587 (delta 252) Receiving objects: 100% (591/591), 73.05 KiB, done. Resolving deltas: 100% (253/253), done. $ cd ticgit/ $ ls LICENSE! ! Rakefile! examples! note! ! ticgit.gemspec README! ! bin! ! lib! ! spec $
  57. $ git clone git://github.com/schacon/ticgit.git Initialized empty Git repository in /private/tmp/ticgit/.git/

    remote: Counting objects: 591, done. remote: Compressing objects: 100% (267/267), done. remote: Total 591 (delta 253), reused 587 (delta 252) Receiving objects: 100% (591/591), 73.05 KiB, done. Resolving deltas: 100% (253/253), done. $ cd ticgit/ $ ls LICENSE! ! Rakefile! examples! note! ! ticgit.gemspec README! ! bin! ! lib! ! spec $
  58. $ git clone git://github.com/schacon/ticgit.git Initialized empty Git repository in /private/tmp/ticgit/.git/

    remote: Counting objects: 591, done. remote: Compressing objects: 100% (267/267), done. remote: Total 591 (delta 253), reused 587 (delta 252) Receiving objects: 100% (591/591), 73.05 KiB, done. Resolving deltas: 100% (253/253), done. $ cd ticgit/ $ ls .git LICENSE! ! Rakefile! examples! note! ! ticgit.gemspec README! ! bin! ! lib! ! spec $
  59. A Basic Workflow Edit files Stage the changes Review your

    changes Commit the changes vim / emacs / etc git add (file) repo status git commit
  60. A Basic Workflow Edit files Stage the changes Review your

    changes Commit the changes vim / emacs / etc git add (file) repo status git commit
  61. A Basic Workflow Edit files Stage the changes Review your

    changes Commit the changes vim / emacs / etc git add (file) repo status git commit
  62. A Basic Workflow Edit files Stage the changes Review your

    changes Commit the changes vim / emacs / etc git add (file) git status / git diff git commit
  63. A Basic Workflow Edit files Stage the changes Review your

    changes Commit the changes vim / emacs / etc git add (file) git status / git diff git commit
  64. $ git commit Created commit 77d3001: descriptive commit message 2

    files changed, 4 insertions(+), 2 deletions(-)
  65. $ git commit Created commit 77d3001: descriptive commit message 2

    files changed, 4 insertions(+), 2 deletions(-)
  66. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b commit size ae668.. tree parent author committer my commit

    message goes here and it is really, really cool c4ec5 a149e Scott Scott
  67. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b commit size ae668.. tree parent author committer my commit

    message goes here and it is really, really cool c4ec5 a149e Scott Scott tree c4ec543b0322744e55c5efc9b6c4e449d398dbff parent a149e2160b3f7573768cdc2fce24d0881f3577e1 author Scott Chacon <[email protected]> 1223402504 -0700 committer Scott Chacon <[email protected]> 1223402504 -0700 descriptive commit message
  68. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b commit size ae668.. tree parent author committer my commit

    message goes here and it is really, really cool c4ec5 a149e Scott Scott
  69. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b commit size ae668.. tree parent author committer my commit

    message goes here and it is really, really cool c4ec5 a149e Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5
  70. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b commit size ae668.. tree parent author committer my commit

    message goes here and it is really, really cool c4ec5 a149e Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 100644 blob 3d5cd3e1fc4424472ea247d1bb5fcfc3809aadab app.yaml 100644 blob 1d31bf2dba611ba0de871320b4d73cdc39cc862b index.yaml 100644 blob 03e68c28b73e2650bee34763369faf6e029d5053 main.py
  71. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b commit size ae668.. tree parent author committer my commit

    message goes here and it is really, really cool c4ec5 a149e Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5
  72. commit size ae668.. tree parent author committer my commit message

    goes here and it is really, really cool c4ec5 a149e Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 commit size tree parent author committer this is the previous commit and I am very proud of it 2de54 38def Scott Scott
  73. commit size ae668.. tree parent author committer my commit message

    goes here and it is really, really cool c4ec5 a149e Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 commit size tree parent author committer this is the previous commit and I am very proud of it 2de54 38def Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5
  74. commit size ae668.. tree parent author committer my commit message

    goes here and it is really, really cool c4ec5 a149e Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 commit size tree parent author committer this is the previous commit and I am very proud of it 2de54 38def Scott Scott commit size tree parent author committer this is the commit before that and I'm not sure why 2fe65 90ecd Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 commit size tree parent author committer this is the commit before that and I'm not sure why 2fe65 90ecd Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5
  75. commit size ae668.. tree parent author committer my commit message

    goes here and it is really, really cool c4ec5 a149e Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 commit size tree parent author committer this is the previous commit and I am very proud of it 2de54 38def Scott Scott commit size tree parent author committer this is the commit before that and I'm not sure why 2fe65 90ecd Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 commit size tree parent author committer this is the commit before that and I'm not sure why 2fe65 90ecd Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 48e 77d a14 38d c4e 3d5 1d3 03e f46 23f 30e 67e 32a 5b1
  76. commit size ae668.. tree parent author committer my commit message

    goes here and it is really, really cool c4ec5 a149e Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 commit size tree parent author committer this is the previous commit and I am very proud of it 2de54 38def Scott Scott commit size tree parent author committer this is the commit before that and I'm not sure why 2fe65 90ecd Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 commit size tree parent author committer this is the commit before that and I'm not sure why 2fe65 90ecd Scott Scott app.yaml index.yaml main.py ./ c4e 03e 1d3 3d5 48e 77d a14 38d c4e 3d5 1d3 03e f46 23f 30e 67e 32a 5b1
  77. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5
  78. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 git checkout branch
  79. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 git checkout branch
  80. Working Directory Index Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README

    ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5
  81. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 Working Directory Index Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3
  82. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 Working Directory Index Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3
  83. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 Working Directory Index Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3
  84. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 Working Directory Index Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 git add
  85. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 Working Directory Index Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 git add 34f
  86. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 Working Directory Index Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 git commit 34f a08 3da 34f ae9
  87. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 Working Directory Index Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 34f a08 3da 34f ae9
  88. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe

    30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4e c4e 77d 3d5 Working Directory Index Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 34f a08 3da 34f ae9
  89. Commit 98ca9 master HEAD c3d README.txt f13 hello.c This is

    Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; }
  90. Commit 98ca9 master HEAD c3d README.txt f13 hello.c This is

    Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; }
  91. Commit 98ca9 master HEAD c3d README.txt f13 hello.c This is

    Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; }
  92. Commit 98ca9 master HEAD c3d README.txt f13 hello.c This is

    Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; }
  93. Commit 98ca9 master HEAD c3d README.txt f13 hello.c This is

    Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } 98ca9 i18n master HEAD git branch i18n
  94. Commit 98ca9 master HEAD c3d README.txt f13 hello.c This is

    Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } 98ca9 i18n master HEAD git branch i18n
  95. Commit 98ca9 master HEAD c3d README.txt f13 hello.c This is

    Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } 98ca9 i18n master HEAD git branch
  96. $ git branch * master i18n Commit 98ca9 master HEAD

    c3d README.txt f13 hello.c This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hello\n"); return 0; } 98ca9 i18n master HEAD git branch
  97. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 43d issue.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt f13 hello.c d3a i18n.c c3d README.txt 9ec hello.c 3a6 i18n.c
  98. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 43d issue.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt f13 hello.c d3a i18n.c c3d README.txt 9ec hello.c 3a6 i18n.c
  99. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 43d issue.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt f13 hello.c d3a i18n.c c3d README.txt 9ec hello.c 3a6 i18n.c
  100. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 43d issue.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt f13 hello.c d3a i18n.c c3d README.txt 9ec hello.c 3a6 i18n.c
  101. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 43d issue.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt f13 hello.c d3a i18n.c c3d README.txt 9ec hello.c 3a6 i18n.c
  102. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 43d issue.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt f13 hello.c d3a i18n.c c3d README.txt 9ec hello.c 3a6 i18n.c
  103. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n git

    merge iss53 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n
  104. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n git

    merge iss53 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n
  105. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master

    HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n
  106. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master

    HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n
  107. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master

    HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n
  108. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master

    HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c
  109. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master

    HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c
  110. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master

    HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c
  111. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master

    HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c
  112. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c 95c41 c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c git merge i18n
  113. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c 95c41 c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c git merge i18n
  114. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c 95c41 c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c
  115. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c 95c41 c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c
  116. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c 95c41 c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c
  117. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c 95c41 c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c
  118. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c 95c41 c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c
  119. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n c3d

    README.txt f13 hello.c c3d README.txt f13 hello.c 5ff issue.c c3d README.txt 9ec hello.c 3a6 i18n.c 95c41 c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c
  120. $ git merge iss53 Auto-merging index.html CONFLICT (content): Merge conflict

    in index.html Automatic merge failed; fix conflicts and then commit the result.
  121. $ git merge iss53 Auto-merging index.html CONFLICT (content): Merge conflict

    in index.html Automatic merge failed; fix conflicts and then commit the result.
  122. $ git merge iss53 Auto-merging index.html CONFLICT (content): Merge conflict

    in index.html Automatic merge failed; fix conflicts and then commit the result. $ git status index.html: needs merge # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # #! unmerged: index.html #
  123. $ git status # On branch master # Changes to

    be committed: # (use "git reset HEAD <file>..." to unstage # #! modified: index.html #
  124. $ git mergetool merge tool candidates: kdiff3 tkdiff xxdiff meld

    gvimdiff opendiff emerge vimdiff Merging the files: index.html Normal merge conflict for 'index.html': {local}: modified {remote}: modified Hit return to start merge resolution tool (opendiff):
  125. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41

    4fa23 c3d README.txt 9ec hello.c 3a6 i18n.c c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c 45d README.txt 9ec hello.c 3a6 i18n.c git merge i18n
  126. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41

    4fa23 c3d README.txt 9ec hello.c 3a6 i18n.c c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c 45d README.txt 9ec hello.c 3a6 i18n.c git merge i18n
  127. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41

    4fa23 c3d README.txt 9ec hello.c 3a6 i18n.c c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c 45d README.txt 9ec hello.c 3a6 i18n.c git merge i18n
  128. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41

    4fa23 c3d README.txt 9ec hello.c 3a6 i18n.c c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c 45d README.txt 9ec hello.c 3a6 i18n.c git merge i18n
  129. 67a2d 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n

    95c41 4fa23 c3d README.txt 9ec hello.c 3a6 i18n.c c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c 45d README.txt 9ec hello.c 3a6 i18n.c 45d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c git merge i18n
  130. 67a2d 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n

    95c41 4fa23 c3d README.txt 9ec hello.c 3a6 i18n.c c3d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c 45d README.txt 9ec hello.c 3a6 i18n.c 45d README.txt 9ec hello.c 5ff issue.c 3a6 i18n.c git merge i18n
  131. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git commit
  132. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git push origin master
  133. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git push origin master
  134. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git push origin master
  135. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git push origin master i want to push some new stuff
  136. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git push origin master i’ve got master at 31b8
  137. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git push origin master cool, i see that in the history of what i want to push
  138. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git push origin master here’s the difference dee9 9e05
  139. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git push origin master dee9 9e05
  140. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 git push origin master dee9 9e05
  141. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 ok, everything looks good.
  142. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 origin/master
  143. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 git push origin master origin/master
  144. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 git push origin master i want to push some new stuff origin/master
  145. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 git push origin master i’ve got master at 9e05 origin/master
  146. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 git push origin master not familiar with that origin/master
  147. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 git push origin master crap. origin/master
  148. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 git push origin master it would be mean of me to overwrite scott’s changes... origin/master
  149. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 origin/master
  150. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 origin/master
  151. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 git fetch origin/master
  152. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 git fetch origin/master
  153. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 origin/master
  154. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 git merge origin/master origin/master
  155. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 git push origin master origin/master
  156. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 git push origin master ok, let’s try that again. i want to push some stuff origin/master
  157. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 git push origin master i’ve got master at 9e05 origin/master
  158. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 git push origin master freakin sweet, i can see that in my history origin/master
  159. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 git push origin master let’s do this e1cf 8091 a967 origin/master
  160. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 git push origin master e1cf 8091 a967 origin/master
  161. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 git push origin master e1cf 8091 a967 origin/master
  162. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 origin/master ok, we’re good.
  163. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091
  164. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091
  165. git checkout -b iss53 31b8; git commit; git commit git.ourcompany.com

    Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53
  166. git push origin iss53 git.ourcompany.com Nick's Computer origin/master f42c 31b8

    Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53
  167. git push origin iss53 git.ourcompany.com Nick's Computer origin/master f42c 31b8

    Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 i want to push some stuff
  168. git push origin iss53 git.ourcompany.com Nick's Computer origin/master f42c 31b8

    Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 i’ve got master at a967
  169. git push origin iss53 git.ourcompany.com Nick's Computer origin/master f42c 31b8

    Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 i don’t care
  170. git push origin iss53 git.ourcompany.com Nick's Computer origin/master f42c 31b8

    Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 i’m trying to push iss53
  171. git push origin iss53 git.ourcompany.com Nick's Computer origin/master f42c 31b8

    Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 here you go
  172. git push origin iss53 git.ourcompany.com Nick's Computer origin/master f42c 31b8

    Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 4ca2 74ba
  173. git push origin iss53 git.ourcompany.com Nick's Computer origin/master f42c 31b8

    Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 4ca2 74ba
  174. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53
  175. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53 git fetch 4ca2 74ba
  176. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53 git fetch 4ca2 74ba
  177. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53 git fetch 4ca2 74ba
  178. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c

    31b8 f42c 31b8 master master master dee9 9e05 e1cf 8091 dee9 9e05 dee9 9e05 a967 a967 e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53 4ca2 74ba origin/iss53
  179. schacon/ project developer nick developer jessica "public" my repo 5ec

    e4a 4a7 ce0 master git push public public/master 5ec e4a 4a7 ce0
  180. schacon/ project developer jessica "public" my repo 5ec e4a 4a7

    ce0 master git clone (url) public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick
  181. schacon/ project developer jessica "public" my repo 5ec e4a 4a7

    ce0 master git commit public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f
  182. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f git clone (url) 5ec e4a 4a7 ce0 developer jessica
  183. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git commit
  184. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git push 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09
  185. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" git remote add nick git://github.com/nickh/project.git
  186. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" “nick” git remote add nick git://github.com/nickh/project.git
  187. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git remote add jess git://github.com/jessica/project.git
  188. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git remote add jess git://github.com/jessica/project.git “jess”
  189. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 git fetch nick 5ec c12 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "jess" c12 ec5 24f nick/master git fetch nick
  190. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch nick 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" c12 ec5 24f nick/master git fetch nick
  191. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch nick 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" c12 ec5 24f nick/master
  192. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git fetch jess schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/ e4a git fetch jess e4a nickh/ project c12 ec5 24f jessic proje "nick" "jess ec5 24f nick/ma 2fb df7 4ea a09 jess/ma c12 schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch nick 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" c12 ec5 24f nick/master
  193. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" git fetch jess schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch jess 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 schacon/ project "public" my repo 5ec e4a 4a7 ce0 master public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch nick 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" c12 ec5 24f nick/master
  194. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git fetch jess 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12
  195. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 git merge nick jess git merge nick/master jess/master
  196. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 git push public 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
  197. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
  198. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
  199. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
  200. schacon/ project "public" my repo 5ec e4a 4a7 ce0 master

    public/master 5ec e4a 4a7 ce0 5ec e4a 4a7 ce0 developer nick c12 ec5 24f 5ec e4a 4a7 ce0 developer jessica 2fb df7 4ea a09 5ec e4a 4a7 ce0 nickh/ project c12 ec5 24f 5ec e4a 4a7 ce0 jessica/ project 2fb df7 4ea a09 "nick" "jess" ec5 24f nick/master 2fb df7 4ea a09 jess/master c12 b3b c63 e4a ec5 24f 2fb df7 4ea a09 c12 b3b c63
  201. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41

    4fa23 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758 faf4e
  202. git log 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD

    i18n 95c41 4fa23 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758 faf4e
  203. git log 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD

    i18n 95c41 4fa23 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758 faf4e
  204. git log 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD

    i18n 95c41 4fa23 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758 faf4e
  205. git log 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD

    i18n 95c41 4fa23 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758 faf4e
  206. git log 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD

    i18n 95c41 4fa23 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758 faf4e
  207. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  208. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  209. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  210. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  211. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  212. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  213. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  214. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  215. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  216. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  217. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  218. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  219. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log commit 16758d868a4e97c9d4281940438b7ea1680cfc0a Merge: 5eea9cf 4b2a7ae Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:29:23 2010 -0700 Merge branch 'i18n' commit 4b2a7ae83bcbb213c7d88c6fada3700f77d43a2e Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:45 2010 -0700 fix spacing issues in both c files commit 1d6389c30cf766daf3dcfe7cc1e3b7fdbfc5cc48 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:28:18 2010 -0700 added i18n file commit 5eea9cf450d5b200d7f134e4024d1c062cb5b341 Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:35 2010 -0700 documented issue file commit 4db9f5c2b4c3935ff787f0fa85e9265c3e306fca Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:27:10 2010 -0700 added issue file
  220. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline 16758d8 Merge branch 'i18n' 4b2a7ae fix spacing issues in both c files 1d6389c added i18n file 5eea9cf documented issue file 4db9f5c added issue file 79c2add initial project import
  221. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline iss53 5eea9cf documented issue file 4db9f5c added issue file 79c2add initial project import
  222. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline i18n faf4ece update README to be more specific 4b2a7ae fix spacing issues in both c files 1d6389c added i18n file 79c2add initial project import
  223. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline 16758d8 Merge branch 'i18n' 4b2a7ae fix spacing issues in both c files 1d6389c added i18n file 5eea9cf documented issue file 4db9f5c added issue file 79c2add initial project import
  224. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline --graph * 16758d8 Merge branch 'i18n' |\ | * 4b2a7ae fix spacing issues in both c files | * 1d6389c added i18n file * | 5eea9cf documented issue file * | 4db9f5c added issue file |/ * 79c2add initial project import
  225. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline --graph * 16758d8 Merge branch 'i18n' |\ | * 4b2a7ae fix spacing issues in both c files | * 1d6389c added i18n file * | 5eea9cf documented issue file * | 4db9f5c added issue file |/ * 79c2add initial project import
  226. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline --graph * 16758d8 Merge branch 'i18n' |\ | * 4b2a7ae fix spacing issues in both c files | * 1d6389c added i18n file * | 5eea9cf documented issue file * | 4db9f5c added issue file |/ * 79c2add initial project import
  227. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline --graph * 16758d8 Merge branch 'i18n' |\ | * 4b2a7ae fix spacing issues in both c files | * 1d6389c added i18n file * | 5eea9cf documented issue file * | 4db9f5c added issue file |/ * 79c2add initial project import
  228. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline --graph * 16758d8 Merge branch 'i18n' |\ | * 4b2a7ae fix spacing issues in both c files | * 1d6389c added i18n file * | 5eea9cf documented issue file * | 4db9f5c added issue file |/ * 79c2add initial project import
  229. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline --graph * 16758d8 Merge branch 'i18n' |\ | * 4b2a7ae fix spacing issues in both c files | * 1d6389c added i18n file * | 5eea9cf documented issue file * | 4db9f5c added issue file |/ * 79c2add initial project import
  230. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline --graph * 16758d8 Merge branch 'i18n' |\ | * 4b2a7ae fix spacing issues in both c files | * 1d6389c added i18n file * | 5eea9cf documented issue file * | 4db9f5c added issue file |/ * 79c2add initial project import
  231. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline --graph --all --decorate * faf4ece (i18n) update README to be more specific | * 16758d8 (HEAD, master) Merge branch 'i18n' | |\ | |/ |/| * | 4b2a7ae fix spacing issues in both c files * | 1d6389c added i18n file | * 5eea9cf (iss53) documented issue file | * 4db9f5c added issue file |/ * 79c2add initial project import
  232. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log --oneline --graph --all --decorate * faf4ece (i18n) update README to be more specific | * 16758d8 (HEAD, master) Merge branch 'i18n' | |\ | |/ |/| * | 4b2a7ae fix spacing issues in both c files * | 1d6389c added i18n file | * 5eea9cf (iss53) documented issue file | * 4db9f5c added issue file |/ * 79c2add initial project import
  233. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git lol --all * faf4ece (i18n) update README to be more specific | * 16758d8 (HEAD, master) Merge branch 'i18n' | |\ | |/ |/| * | 4b2a7ae fix spacing issues in both c files * | 1d6389c added i18n file | * 5eea9cf (iss53) documented issue file | * 4db9f5c added issue file |/ * 79c2add initial project import
  234. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git lol iss53 ^i18n * 5eea9cf (iss53) documented issue file * 4db9f5c added issue file
  235. 79c2a 1d638 5eea9 iss53 4db9f 4b2a7 master HEAD i18n 16758

    faf4e $ git log i18n ^master commit faf4ecee82715967b07ff98e88796a311c8761fe Author: Scott Chacon <[email protected]> Date: Wed Jul 28 16:30:00 2010 -0700 update README to be more specific $
  236. Review git init git clone git add git status git

    commit git branch git checkout
  237. Review git init git clone git add git status git

    commit git branch git checkout git merge
  238. Review git init git clone git add git status git

    commit git branch git checkout git merge git push
  239. Review git init git clone git add git status git

    commit git branch git checkout git merge git push git fetch
  240. Review git init git clone git add git status git

    commit git branch git checkout git merge git push git fetch git pull
  241. Review git init git clone git add git status git

    commit git branch git checkout git merge git push git fetch git pull git log
  242. Review git init git clone git add git status git

    commit git branch git checkout git merge git push git fetch git pull git log 12