Successfully reported this slideshow.
Your SlideShare is downloading. ×

Ankara jug mayıs 2013 sunumu

Ad
Ad
Ad
Ad
Ad
Ad
Ad
Ad
Ad
Ad
Ad

Check these out next

1 of 322 Ad

More Related Content

Slideshows for you (20)

Advertisement

Similar to Ankara jug mayıs 2013 sunumu (20)

Advertisement

Recently uploaded (20)

Ankara jug mayıs 2013 sunumu

  1. 1. Mustafa Sakalsız mustafa.sakalsiz@t2.com.tr 30 Mayıs 2013 5 Haziran 13 Çarşamba
  2. 2. nedir? 5 Haziran 13 Çarşamba
  3. 3. •Açık Kaynak •Dağıtık •Hızlı •Verimli bir sürüm kontrol sistemidir 5 Haziran 13 Çarşamba
  4. 4. Açık Kaynak 5 Haziran 13 Çarşamba
  5. 5. Açık Kaynak 5 Haziran 13 Çarşamba
  6. 6. Dağıtık ? 5 Haziran 13 Çarşamba
  7. 7. Bilgisayar A Merkezi SKS Versiyon Veritabanı Versiyon 3 Versiyon 2 Versiyon 1 Dosya checkout Bilgisayar B Dosya 5 Haziran 13 Çarşamba
  8. 8. Bilgisayar A Merkezi SKS Versiyon Veritabanı Versiyon 3 Versiyon 2 Versiyon 1 Dosya checkout Bilgisayar B Dosya 5 Haziran 13 Çarşamba
  9. 9. Bilgisayar A Merkezi SKS Versiyon Veritabanı Versiyon 3 Versiyon 2 Versiyon 1 Dosya checkout Bilgisayar B Dosya 5 Haziran 13 Çarşamba
  10. 10. Bilgisayar A Versiyon Veritabanı Versiyon 3 Versiyon 2 Versiyon 1 Bilgisayar B Versiyon Veritabanı Versiyon 3 Versiyon 2 Versiyon 1 Sunucu Versiyon Veritabanı Versiyon 3 Versiyon 2 Versiyon 1 5 Haziran 13 Çarşamba
  11. 11. •Diff Almak •Dosya Geçmişine Bakmak •Commit •Branch Merge •Branch Değiştirme için sunucuya ihtiyaç yoktur 5 Haziran 13 Çarşamba
  12. 12. Branch, Merge ? 5 Haziran 13 Çarşamba
  13. 13. 5 Haziran 13 Çarşamba
  14. 14. •Kaç kişi branch oluşturdu? 5 Haziran 13 Çarşamba
  15. 15. •Kaç kişi branch oluşturdu? •Kaç kişi merge edebildi? 5 Haziran 13 Çarşamba
  16. 16. •Kaç kişi branch oluşturdu? •Kaç kişi merge edebildi? •Kaç kişi bu işten keyif aldı? 5 Haziran 13 Çarşamba
  17. 17. Açık Kaynak Proje • Herkesin Commit Hakkı Var • Network of Trust 5 Haziran 13 Çarşamba
  18. 18. Ticari Proje • Geliştirme Takımı • Doğrulama Takımı • Sürüm Yönetimi • ... 5 Haziran 13 Çarşamba
  19. 19. 5 Haziran 13 Çarşamba
  20. 20. Scott Shacon Introduction to Git 5 Haziran 13 Çarşamba
  21. 21. Snapshots, not Patches 5 Haziran 13 Çarşamba
  22. 22. File Based Delta Storage 5 Haziran 13 Çarşamba
  23. 23. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } README.txt hello.c hola.c 5 Haziran 13 Çarşamba
  24. 24. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } README.txt hello.c hola.c 5 Haziran 13 Çarşamba
  25. 25. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } README.txt hello.c hola.c 5 Haziran 13 Çarşamba
  26. 26. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } README.txt hello.c hola.c #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B README.txt hello.c hola.c 5 Haziran 13 Çarşamba
  27. 27. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B README.txt hello.c hola.c 5 Haziran 13 Çarşamba
  28. 28. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B README.txt hello.c hola.c 5 Haziran 13 Çarşamba
  29. 29. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B README.txt hello.c hola.c hola.c 5 Haziran 13 Çarşamba
  30. 30. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B Commit C README.txt hello.c hola.c (rename) 5 Haziran 13 Çarşamba
  31. 31. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B Commit C README.txt hello.c hola.c (rename) 5 Haziran 13 Çarşamba
  32. 32. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy) #include<stdio.h> int main(void) { printf("Holan"); return 0; } hello.c #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B Commit C README.txt hello.c hola.c (rename) 5 Haziran 13 Çarşamba
  33. 33. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy) #include<stdio.h> int main(void) { printf("Holan"); return 0; } hello.c #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B Commit C README.txt hello.c hola.c (rename) 5 Haziran 13 Çarşamba
  34. 34. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy) #include<stdio.h> int main(void) { printf("Holan"); return 0; } hello.c 5 Haziran 13 Çarşamba
  35. 35. Git Snapshots 5 Haziran 13 Çarşamba
  36. 36. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } f13 5 Haziran 13 Çarşamba
  37. 37. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } f13 CHECKSUM 5 Haziran 13 Çarşamba
  38. 38. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } f13 CHECKSUM 5 Haziran 13 Çarşamba
  39. 39. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } f13 5 Haziran 13 Çarşamba
  40. 40. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } f13 5 Haziran 13 Çarşamba
  41. 41. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } f13 5 Haziran 13 Çarşamba
  42. 42. #include<stdio.h> int main(void) { printf("Hellon"); 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("Hellon"); return 0; } f13 5 Haziran 13 Çarşamba
  43. 43. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 5 Haziran 13 Çarşamba
  44. 44. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c 5 Haziran 13 Çarşamba
  45. 45. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c 5 Haziran 13 Çarşamba
  46. 46. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c 5 Haziran 13 Çarşamba
  47. 47. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c 5 Haziran 13 Çarşamba
  48. 48. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c 5 Haziran 13 Çarşamba
  49. 49. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c 5 Haziran 13 Çarşamba
  50. 50. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c 5 Haziran 13 Çarşamba
  51. 51. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c 5 Haziran 13 Çarşamba
  52. 52. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c 5 Haziran 13 Çarşamba
  53. 53. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c 5 Haziran 13 Çarşamba
  54. 54. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); return 0; } 6d4 Commit B c3d README.txt 6d4 hello.c Commit C c3d README.txt 6d4 hola.c 5 Haziran 13 Çarşamba
  55. 55. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); 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("Holan"); return 0; } hello.c 5 Haziran 13 Çarşamba
  56. 56. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); 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("Holan"); return 0; } hello.c 5 Haziran 13 Çarşamba
  57. 57. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); 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("Holan"); return 0; } hello.c 5 Haziran 13 Çarşamba
  58. 58. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); 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("Holan"); return 0; } hello.c 5 Haziran 13 Çarşamba
  59. 59. #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); 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("Holan"); return 0; } hello.c 5 Haziran 13 Çarşamba
  60. 60. Commit A This is Scott's Hello project. Licensed under GPL. #include<stdio.h> int main(void) { printf("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy) 5 Haziran 13 Çarşamba
  61. 61. 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("Hellon"); return 0; } f13 #include<stdio.h> int main(void) { printf("Holan"); 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("Hellon"); return 0; } - printf("Holan"); + printf("Holan"); Commit B Commit C -Hello +Hola Commit D README.txt hello.c hola.c (rename) (copy) 5 Haziran 13 Çarşamba
  62. 62. First Steps 5 Haziran 13 Çarşamba
  63. 63. $ git config --global user.name “Scott Chacon” $ git config --global user.email “schacon@gmail.com” 5 Haziran 13 Çarşamba
  64. 64. $ git config --global color.ui true 5 Haziran 13 Çarşamba
  65. 65. 5 Haziran 13 Çarşamba
  66. 66. Getting a Repo 5 Haziran 13 Çarşamba
  67. 67. Create One 5 Haziran 13 Çarşamba
  68. 68. git init 5 Haziran 13 Çarşamba
  69. 69. $ touch hello_world.rb $ git init $ git add . $ git commit -m ‘first commit’ 5 Haziran 13 Çarşamba
  70. 70. $ touch hello_world.rb $ git init $ git add . $ git commit -m ‘first commit’ 5 Haziran 13 Çarşamba
  71. 71. $ 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 5 Haziran 13 Çarşamba
  72. 72. $ 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 5 Haziran 13 Çarşamba
  73. 73. $ 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 5 Haziran 13 Çarşamba
  74. 74. $ touch hello_world.rb $ git init $ git add . $ git commit -m ‘first commit’ 5 Haziran 13 Çarşamba
  75. 75. $ touch hello_world.rb $ git init $ git add . $ git commit -m ‘first commit’ 5 Haziran 13 Çarşamba
  76. 76. $ 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 5 Haziran 13 Çarşamba
  77. 77. $ 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 5 Haziran 13 Çarşamba
  78. 78. $ 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 5 Haziran 13 Çarşamba
  79. 79. Clone One 5 Haziran 13 Çarşamba
  80. 80. git clone 5 Haziran 13 Çarşamba
  81. 81. $ 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 $ 5 Haziran 13 Çarşamba
  82. 82. $ 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 $ 5 Haziran 13 Çarşamba
  83. 83. $ 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 $ 5 Haziran 13 Çarşamba
  84. 84. $ 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 $ 5 Haziran 13 Çarşamba
  85. 85. Recording a Snapshot 5 Haziran 13 Çarşamba
  86. 86. A Basic Workflow Edit files Stage the changes Review your changes Commit the changes vim / emacs / etc git add (file) repo status git commit 5 Haziran 13 Çarşamba
  87. 87. A Basic Workflow Edit files Stage the changes Review your changes Commit the changes vim / emacs / etc git add (file) repo status git commit 5 Haziran 13 Çarşamba
  88. 88. A Basic Workflow Edit files Stage the changes Review your changes Commit the changes vim / emacs / etc git add (file) repo status git commit 5 Haziran 13 Çarşamba
  89. 89. 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 5 Haziran 13 Çarşamba
  90. 90. 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 5 Haziran 13 Çarşamba
  91. 91. A Basicerer Workflow Edit files Stage and Commit vim / emacs / etc git commit -a 5 Haziran 13 Çarşamba
  92. 92. What’s going on here? 5 Haziran 13 Çarşamba
  93. 93. $ git commit Created commit 77d3001: descriptive commit message 2 files changed, 4 insertions(+), 2 deletions(-) 5 Haziran 13 Çarşamba
  94. 94. $ git commit Created commit 77d3001: descriptive commit message 2 files changed, 4 insertions(+), 2 deletions(-) 5 Haziran 13 Çarşamba
  95. 95. 77d3001 5 Haziran 13 Çarşamba
  96. 96. 77d3001 5 Haziran 13 Çarşamba
  97. 97. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b 5 Haziran 13 Çarşamba
  98. 98. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b 5 Haziran 13 Çarşamba
  99. 99. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b 5 Haziran 13 Çarşamba
  100. 100. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b commit size ae668.. tree parent author committer my commit message goes here and it is really, really cool c4ec5 a149e Scott Scott 5 Haziran 13 Çarşamba
  101. 101. 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 <schacon@gmail.com> 1223402504 -0700 committer Scott Chacon <schacon@gmail.com> 1223402504 -0700 descriptive commit message 5 Haziran 13 Çarşamba
  102. 102. 77d3001a1de6bf8f5e431972fe4d25b01e595c0b commit size ae668.. tree parent author committer my commit message goes here and it is really, really cool c4ec5 a149e Scott Scott 5 Haziran 13 Çarşamba
  103. 103. 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 5 Haziran 13 Çarşamba
  104. 104. 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 3d5100644 blob 3d5cd3e1fc4424472ea247d1bb5fcfc3809aadab app.yaml 100644 blob 1d31bf2dba611ba0de871320b4d73cdc39cc862b index.yaml 100644 blob 03e68c28b73e2650bee34763369faf6e029d5053 main.py 5 Haziran 13 Çarşamba
  105. 105. 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 5 Haziran 13 Çarşamba
  106. 106. 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 5 Haziran 13 Çarşamba
  107. 107. 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 5 Haziran 13 Çarşamba
  108. 108. 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 5 Haziran 13 Çarşamba
  109. 109. 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 77da1438d c4e 3d5 1d3 03e f46 23f 30e 67e 32a 5b1 5 Haziran 13 Çarşamba
  110. 110. 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 5 Haziran 13 Çarşamba
  111. 111. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 5 Haziran 13 Çarşamba
  112. 112. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 git checkout branch 5 Haziran 13 Çarşamba
  113. 113. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 git checkout branch 5 Haziran 13 Çarşamba
  114. 114. Working DirectoryIndex 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 c4ec4e 77d 3d5 5 Haziran 13 Çarşamba
  115. 115. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 Working DirectoryIndex Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 5 Haziran 13 Çarşamba
  116. 116. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 Working DirectoryIndex Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 5 Haziran 13 Çarşamba
  117. 117. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 Working DirectoryIndex Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 5 Haziran 13 Çarşamba
  118. 118. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 Working DirectoryIndex Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 git add 5 Haziran 13 Çarşamba
  119. 119. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 Working DirectoryIndex Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 git add 34f 5 Haziran 13 Çarşamba
  120. 120. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 Working DirectoryIndex Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d3 git commit 34f a083da34f ae9 5 Haziran 13 Çarşamba
  121. 121. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 Working DirectoryIndex Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d334f a083da34f ae9 5 Haziran 13 Çarşamba
  122. 122. Repository 3d4 03e ae6 5b1 1d3 c36 f46 23f 6fe 30e 67e 32a ffe 38d 5b1 1d3 254 a14 d23 2d3 48e 735 de3 c4ec4e 77d 3d5 Working DirectoryIndex Rakefile README simplegit.rb ./ lib/ ./Rakefile ./README ./lib/simplegit.rb ./ ./lib/ c36 3d4 03e 5b1 1d334f a083da34f ae9 5 Haziran 13 Çarşamba
  123. 123. Branching and Merging 5 Haziran 13 Çarşamba
  124. 124. branches 5 Haziran 13 Çarşamba
  125. 125. branches lightweight, movable pointers to a commit C1 branch 5 Haziran 13 Çarşamba
  126. 126. branching 5 Haziran 13 Çarşamba
  127. 127. git branch 5 Haziran 13 Çarşamba
  128. 128. git checkout 5 Haziran 13 Çarşamba
  129. 129. 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("Hellon"); return 0; } 5 Haziran 13 Çarşamba
  130. 130. 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("Hellon"); return 0; } 5 Haziran 13 Çarşamba
  131. 131. 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("Hellon"); return 0; } 5 Haziran 13 Çarşamba
  132. 132. 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("Hellon"); return 0; } 5 Haziran 13 Çarşamba
  133. 133. 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("Hellon"); return 0; } 98ca9 i18n master HEAD git branch i18n 5 Haziran 13 Çarşamba
  134. 134. 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("Hellon"); return 0; } 98ca9 i18n master HEAD git branch i18n 5 Haziran 13 Çarşamba
  135. 135. 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("Hellon"); return 0; } 98ca9 i18n master HEAD git branch 5 Haziran 13 Çarşamba
  136. 136. $ 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("Hellon"); return 0; } 98ca9 i18n master HEAD git branch 5 Haziran 13 Çarşamba
  137. 137. $ find .git/refs .git/refs .git/refs/heads .git/refs/heads/default .git/refs/heads/experiment 5 Haziran 13 Çarşamba
  138. 138. $ find .git/refs .git/refs .git/refs/heads .git/refs/heads/master .git/refs/heads/i18n 5 Haziran 13 Çarşamba
  139. 139. $ find .git/refs .git/refs .git/refs/heads .git/refs/heads/master .git/refs/heads/i18n $ cat .git/refs/heads/master 98ca909dc9e38af91565082bdf93577ff555489e 5 Haziran 13 Çarşamba
  140. 140. 98ca9 a23fe i18n master HEAD HEAD 5 Haziran 13 Çarşamba
  141. 141. 98ca9 a23fe i18n master HEAD HEAD git checkout i18n 5 Haziran 13 Çarşamba
  142. 142. 98ca9 a23fe i18n master HEAD HEAD 5 Haziran 13 Çarşamba
  143. 143. 98ca9 a23fe i18n master HEAD HEAD git commit 5 Haziran 13 Çarşamba
  144. 144. 98ca9 a23fe i18n master HEAD HEAD git commit 5 Haziran 13 Çarşamba
  145. 145. git commit 98ca9 a23fe master i18n HEAD 5 Haziran 13 Çarşamba
  146. 146. 98ca9 a23fe master i18n HEAD 5 Haziran 13 Çarşamba
  147. 147. git commit 98ca9 a23fe master i18n HEAD 5 Haziran 13 Çarşamba
  148. 148. git commit 98ca9 a23fe 3acd1 master i18n HEAD 5 Haziran 13 Çarşamba
  149. 149. 98ca9 a23fe 3acd1 master i18n HEAD 5 Haziran 13 Çarşamba
  150. 150. 98ca9 a23fe 3acd1 master i18n HEAD git checkout -b iss53 master 5 Haziran 13 Çarşamba
  151. 151. 98ca9 a23fe iss53 3acd1 master HEAD i18n git checkout -b iss53 master 5 Haziran 13 Çarşamba
  152. 152. 98ca9 a23fe iss53 3acd1 master HEAD i18n git checkout master; git checkout -b iss53 5 Haziran 13 Çarşamba
  153. 153. 98ca9 a23fe iss53 3acd1 master HEAD i18n git checkout master; git branch iss53; git checkout iss53 5 Haziran 13 Çarşamba
  154. 154. 98ca9 a23fe iss53 3acd1 master HEAD i18n git checkout -b iss53 master 5 Haziran 13 Çarşamba
  155. 155. 98ca9 a23fe iss53 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  156. 156. git commit 98ca9 a23fe iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  157. 157. 98ca9 a23fe iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  158. 158. git commit 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  159. 159. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  160. 160. 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 5 Haziran 13 Çarşamba
  161. 161. 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 5 Haziran 13 Çarşamba
  162. 162. 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 5 Haziran 13 Çarşamba
  163. 163. 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 5 Haziran 13 Çarşamba
  164. 164. 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 5 Haziran 13 Çarşamba
  165. 165. 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 5 Haziran 13 Çarşamba
  166. 166. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  167. 167. merging 5 Haziran 13 Çarşamba
  168. 168. git merge 5 Haziran 13 Çarşamba
  169. 169. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  170. 170. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n git checkout master 5 Haziran 13 Çarşamba
  171. 171. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  172. 172. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n git merge iss53 5 Haziran 13 Çarşamba
  173. 173. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n git merge iss53 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  174. 174. fast-forward merge 5 Haziran 13 Çarşamba
  175. 175. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n git merge iss53 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  176. 176. git merge iss53 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  177. 177. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  178. 178. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  179. 179. non fast-forward merge 5 Haziran 13 Çarşamba
  180. 180. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 5 Haziran 13 Çarşamba
  181. 181. 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 5 Haziran 13 Çarşamba
  182. 182. 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 5 Haziran 13 Çarşamba
  183. 183. 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 5 Haziran 13 Çarşamba
  184. 184. 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 5 Haziran 13 Çarşamba
  185. 185. 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 5 Haziran 13 Çarşamba
  186. 186. 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 5 Haziran 13 Çarşamba
  187. 187. 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 5 Haziran 13 Çarşamba
  188. 188. 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 5 Haziran 13 Çarşamba
  189. 189. 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 5 Haziran 13 Çarşamba
  190. 190. 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 5 Haziran 13 Çarşamba
  191. 191. 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 5 Haziran 13 Çarşamba
  192. 192. 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 5 Haziran 13 Çarşamba
  193. 193. 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 5 Haziran 13 Çarşamba
  194. 194. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 5 Haziran 13 Çarşamba
  195. 195. merge conflicts 5 Haziran 13 Çarşamba
  196. 196. $ git merge iss53 Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. 5 Haziran 13 Çarşamba
  197. 197. $ git merge iss53 Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. 5 Haziran 13 Çarşamba
  198. 198. $ 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 # 5 Haziran 13 Çarşamba
  199. 199. <<<<<<< HEAD:index.html <div id="footer">contact : email.support@github.com</div> ======= <div id="footer"> please contact us at support@github.com </div> >>>>>>> iss53:index.html 5 Haziran 13 Çarşamba
  200. 200. $ git add [file] 5 Haziran 13 Çarşamba
  201. 201. $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage # #!modified: index.html # 5 Haziran 13 Çarşamba
  202. 202. git mergetool 5 Haziran 13 Çarşamba
  203. 203. $ 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): 5 Haziran 13 Çarşamba
  204. 204. $ git commit 5 Haziran 13 Çarşamba
  205. 205. reintegration merges 5 Haziran 13 Çarşamba
  206. 206. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 5 Haziran 13 Çarşamba
  207. 207. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 git checkout i18n 5 Haziran 13 Çarşamba
  208. 208. git commit 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 5 Haziran 13 Çarşamba
  209. 209. git checkout master 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 5 Haziran 13 Çarşamba
  210. 210. git merge i18n 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 5 Haziran 13 Çarşamba
  211. 211. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 git merge i18n 5 Haziran 13 Çarşamba
  212. 212. 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 5 Haziran 13 Çarşamba
  213. 213. 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 5 Haziran 13 Çarşamba
  214. 214. 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 5 Haziran 13 Çarşamba
  215. 215. 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 5 Haziran 13 Çarşamba
  216. 216. 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 5 Haziran 13 Çarşamba
  217. 217. 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 5 Haziran 13 Çarşamba
  218. 218. git merge i18n 67a2d 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 5 Haziran 13 Çarşamba
  219. 219. Why is this cool? 5 Haziran 13 Çarşamba
  220. 220. try out an idea 5 Haziran 13 Çarşamba
  221. 221. isolate work units 5 Haziran 13 Çarşamba
  222. 222. long running topics 5 Haziran 13 Çarşamba
  223. 223. long running topics continuous merging 5 Haziran 13 Çarşamba
  224. 224. Deleting Branches 5 Haziran 13 Çarşamba
  225. 225. git branch -d branch 5 Haziran 13 Çarşamba
  226. 226. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 5 Haziran 13 Çarşamba
  227. 227. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 5 Haziran 13 Çarşamba
  228. 228. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 5 Haziran 13 Çarşamba
  229. 229. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 5 Haziran 13 Çarşamba
  230. 230. 98ca9 a23fe f30ab iss53 34ac2 3acd1 master HEAD i18n 95c41 4fa23 5 Haziran 13 Çarşamba
  231. 231. git branch -D branch 5 Haziran 13 Çarşamba
  232. 232. Collaborating 5 Haziran 13 Çarşamba
  233. 233. remotes 5 Haziran 13 Çarşamba
  234. 234. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master 5 Haziran 13 Çarşamba
  235. 235. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master git clone nick@git.ourcompany.com:project.git 5 Haziran 13 Çarşamba
  236. 236. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master git clone nick@git.ourcompany.com:project.git 5 Haziran 13 Çarşamba
  237. 237. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master git clone nick@git.ourcompany.com:project.git 5 Haziran 13 Çarşamba
  238. 238. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master git clone scott@git.ourcompany.com:project.git 5 Haziran 13 Çarşamba
  239. 239. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master 5 Haziran 13 Çarşamba
  240. 240. git.ourcompany.com Nick's Computer origin/master f42c 31b8 Scott's Computer origin/master f42c 31b8 f42c 31b8 master master master dee9 9e05 git commit 5 Haziran 13 Çarşamba
  241. 241. 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 5 Haziran 13 Çarşamba
  242. 242. git push 5 Haziran 13 Çarşamba
  243. 243. 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 5 Haziran 13 Çarşamba
  244. 244. 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 5 Haziran 13 Çarşamba
  245. 245. 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 5 Haziran 13 Çarşamba
  246. 246. 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 5 Haziran 13 Çarşamba
  247. 247. 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 5 Haziran 13 Çarşamba
  248. 248. 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 5 Haziran 13 Çarşamba
  249. 249. 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 5 Haziran 13 Çarşamba
  250. 250. 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 5 Haziran 13 Çarşamba
  251. 251. 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 5 Haziran 13 Çarşamba
  252. 252. 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. 5 Haziran 13 Çarşamba
  253. 253. 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 5 Haziran 13 Çarşamba
  254. 254. 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 5 Haziran 13 Çarşamba
  255. 255. 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 5 Haziran 13 Çarşamba
  256. 256. 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 5 Haziran 13 Çarşamba
  257. 257. 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 5 Haziran 13 Çarşamba
  258. 258. 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 5 Haziran 13 Çarşamba
  259. 259. 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 5 Haziran 13 Çarşamba
  260. 260. 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 5 Haziran 13 Çarşamba
  261. 261. git fetch 5 Haziran 13 Çarşamba
  262. 262. 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 5 Haziran 13 Çarşamba
  263. 263. 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 9e05dee9 9e05 git fetch origin/master 5 Haziran 13 Çarşamba
  264. 264. 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 5 Haziran 13 Çarşamba
  265. 265. 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 5 Haziran 13 Çarşamba
  266. 266. 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 5 Haziran 13 Çarşamba
  267. 267. 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 5 Haziran 13 Çarşamba
  268. 268. 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 5 Haziran 13 Çarşamba
  269. 269. 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 5 Haziran 13 Çarşamba
  270. 270. 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 5 Haziran 13 Çarşamba
  271. 271. 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 5 Haziran 13 Çarşamba
  272. 272. 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 5 Haziran 13 Çarşamba
  273. 273. 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 5 Haziran 13 Çarşamba
  274. 274. 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 a967e1cf 8091 origin/master ok, we’re good. 5 Haziran 13 Çarşamba
  275. 275. 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 a967e1cf 8091 5 Haziran 13 Çarşamba
  276. 276. pushing other branches 5 Haziran 13 Çarşamba
  277. 277. 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 a967e1cf 8091 5 Haziran 13 Çarşamba
  278. 278. 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 a967e1cf 8091 4ca2 74ba iss53 5 Haziran 13 Çarşamba
  279. 279. 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 a967e1cf 8091 4ca2 74ba iss53 5 Haziran 13 Çarşamba
  280. 280. 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 a967e1cf 8091 4ca2 74ba iss53 i want to push some stuff 5 Haziran 13 Çarşamba
  281. 281. 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 a967e1cf 8091 4ca2 74ba iss53 i’ve got master at a967 5 Haziran 13 Çarşamba
  282. 282. 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 a967e1cf 8091 4ca2 74ba iss53 i don’t care 5 Haziran 13 Çarşamba
  283. 283. 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 a967e1cf 8091 4ca2 74ba iss53 i’m trying to push iss53 5 Haziran 13 Çarşamba
  284. 284. 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 a967e1cf 8091 4ca2 74ba iss53 here you go 5 Haziran 13 Çarşamba
  285. 285. 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 a967e1cf 8091 4ca2 74ba iss53 4ca2 74ba 5 Haziran 13 Çarşamba
  286. 286. 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 a967e1cf 8091 4ca2 74ba iss53 4ca2 74ba 5 Haziran 13 Çarşamba
  287. 287. 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 a967e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53 5 Haziran 13 Çarşamba
  288. 288. 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 a967e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53 git fetch 4ca2 74ba 5 Haziran 13 Çarşamba
  289. 289. 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 a967e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53 git fetch 4ca2 74ba 5 Haziran 13 Çarşamba
  290. 290. 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 a967e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53 git fetch 4ca2 74ba 5 Haziran 13 Çarşamba
  291. 291. 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 a967e1cf 8091 4ca2 74ba iss53 4ca2 74ba iss53 4ca2 74ba origin/iss53 5 Haziran 13 Çarşamba
  292. 292. git pull 5 Haziran 13 Çarşamba
  293. 293. pull == fetch + merge 5 Haziran 13 Çarşamba
  294. 294. multiple remotes 5 Haziran 13 Çarşamba
  295. 295. developer nick developer jessica my repo 5ec e4a 4a7ce0 master 5 Haziran 13 Çarşamba
  296. 296. developer nick developer jessica my repo 5ec e4a 4a7ce0 master commit 5 Haziran 13 Çarşamba
  297. 297. developer nick developer jessica my repo 5ec e4a 4a7ce0 master tree 5 Haziran 13 Çarşamba
  298. 298. developer nick developer jessica my repo 5ec e4a 4a7ce0 master blobs 5 Haziran 13 Çarşamba
  299. 299. schacon/ project developer nick developer jessica "public" my repo 5ec e4a 4a7ce0 master git push public public/master 5ec e4a 4a7ce0 5 Haziran 13 Çarşamba
  300. 300. schacon/ project developer jessica "public" my repo 5ec e4a 4a7ce0 master git clone (url) public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick 5 Haziran 13 Çarşamba
  301. 301. schacon/ project developer jessica "public" my repo 5ec e4a 4a7ce0 master git commit public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5 Haziran 13 Çarşamba
  302. 302. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f git clone (url) 5ec e4a 4a7ce0 developer jessica 5 Haziran 13 Çarşamba
  303. 303. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git commit 5 Haziran 13 Çarşamba
  304. 304. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git push 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09 5 Haziran 13 Çarşamba
  305. 305. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" git remote add nick git://github.com/nickh/project.git 5 Haziran 13 Çarşamba
  306. 306. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add nick git://github.com/nickh/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick"“nick” git remote add nick git://github.com/nickh/project.git 5 Haziran 13 Çarşamba
  307. 307. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" git remote add jess git://github.com/jessica/project.git 5 Haziran 13 Çarşamba
  308. 308. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" git remote add jess git://github.com/jessica/project.git “jess” 5 Haziran 13 Çarşamba
  309. 309. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 git fetch nick 5ec c12 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"jess" c12ec524f nick/master git fetch nick 5 Haziran 13 Çarşamba
  310. 310. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git fetch nick 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" c12ec524f nick/master git fetch nick 5 Haziran 13 Çarşamba
  311. 311. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git fetch nick 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" c12ec524f nick/master 5 Haziran 13 Çarşamba
  312. 312. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" git fetch jess schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/ e4a git fetch jess e4a nickh/ project c12ec524f jessic proje "nick" "jess ec524f nick/ma 2fbdf74ea a09 jess/ma c12 schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git fetch nick 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" c12ec524f nick/master 5 Haziran 13 Çarşamba
  313. 313. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git remote add jess git://github.com/jessica/project.git 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" git fetch jess schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git fetch jess 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git fetch nick 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" c12ec524f nick/master 5 Haziran 13 Çarşamba
  314. 314. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git fetch jess 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 5 Haziran 13 Çarşamba
  315. 315. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 b3bc63 git merge nick jessgit merge nick/master jess/master 5 Haziran 13 Çarşamba
  316. 316. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 git push public 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 b3bc63 e4a ec524f 2fbdf74ea a09 c12 b3bc63 5 Haziran 13 Çarşamba
  317. 317. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 b3bc63 e4a ec524f 2fbdf74ea a09 c12 b3bc63 5 Haziran 13 Çarşamba
  318. 318. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 b3bc63 e4a ec524f 2fbdf74ea a09 c12 b3bc63 5 Haziran 13 Çarşamba
  319. 319. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 b3bc63 e4a ec524f 2fbdf74ea a09 c12 b3bc63 5 Haziran 13 Çarşamba
  320. 320. schacon/ project "public" my repo 5ec e4a 4a7ce0 master public/master 5ec e4a 4a7ce0 5ec e4a 4a7ce0 developer nick c12ec524f 5ec e4a 4a7ce0 developer jessica 2fbdf74ea a09 5ec e4a 4a7ce0 nickh/ project c12ec524f 5ec e4a 4a7ce0 jessica/ project 2fbdf74ea a09"nick" "jess" ec524f nick/master 2fbdf74ea a09 jess/master c12 b3bc63 e4a ec524f 2fbdf74ea a09 c12 b3bc63 5 Haziran 13 Çarşamba
  321. 321. Git Repository Yönetimi Stash Gitolite Gitosis Şirketiçi Hosted GitHub Gitorious Bitbucket 5 Haziran 13 Çarşamba
  322. 322. Referanslar git-scm.com Tech Talk: Linus Torvalds on Git Introduction to Git: Scott Chacon 5 Haziran 13 Çarşamba

×