Ankara jug mayıs 2013 sunumu

Mustafa Sakalsızmustafa.sakalsiz@t2.com.tr

30 Mayıs 2013

5 Haziran 13 Çarşamba

nedir?

5 Haziran 13 Çarşamba

•Açık Kaynak

•Dağıtık

•Hızlı

•Verimli

bir sürüm kontrol sistemidir

5 Haziran 13 Çarşamba

Açık Kaynak

5 Haziran 13 Çarşamba

Açık Kaynak

5 Haziran 13 Çarşamba

Dağıtık ?

5 Haziran 13 Çarşamba

Bilgisayar A Merkezi SKS

Versiyon Veritabanı

Versiyon 3

Versiyon 2

Versiyon 1

Dosya

checkout

Bilgisayar B

Dosya

5 Haziran 13 Çarşamba

Bilgisayar A Merkezi SKS

Versiyon Veritabanı

Versiyon 3

Versiyon 2

Versiyon 1

Dosya

checkout

Bilgisayar B

Dosya

5 Haziran 13 Çarşamba

Bilgisayar A Merkezi SKS

Versiyon Veritabanı

Versiyon 3

Versiyon 2

Versiyon 1

Dosya

checkout

Bilgisayar B

Dosya

5 Haziran 13 Çarşamba

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

•Diff Almak•Dosya Geçmişine Bakmak•Commit•Branch Merge•Branch Değiştirme

için sunucuya ihtiyaç yoktur

5 Haziran 13 Çarşamba

Branch, Merge ?

5 Haziran 13 Çarşamba

5 Haziran 13 Çarşamba

•Kaç kişi branch oluşturdu?

5 Haziran 13 Çarşamba

•Kaç kişi branch oluşturdu?

•Kaç kişi merge edebildi?

5 Haziran 13 Çarşamba

•Kaç kişi branch oluşturdu?

•Kaç kişi merge edebildi?

•Kaç kişi bu işten keyif aldı?

5 Haziran 13 Çarşamba

Açık Kaynak Proje

• Herkesin Commit Hakkı Var• Network of Trust

5 Haziran 13 Çarşamba

Ticari Proje

• Geliştirme Takımı• Doğrulama Takımı• Sürüm Yönetimi• ...

5 Haziran 13 Çarşamba

5 Haziran 13 Çarşamba

Scott Shacon

Introduction to Git

5 Haziran 13 Çarşamba

Snapshots, not Patches

5 Haziran 13 Çarşamba

File BasedDelta Storage

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

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

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

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

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

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

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

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

CommitA

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");

CommitB

README.txt

hello.c

hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

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");

CommitB

README.txt

hello.c

hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

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");

CommitB

README.txt

hello.c

hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

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");

CommitB

README.txt

hello.c

hola.c

hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hola.c

CommitA

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");

CommitB

CommitC

README.txt

hello.c

hola.c (rename)

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hola.c

CommitA

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");

CommitB

CommitC

README.txt

hello.c

hola.c (rename)

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hola project.

Licensed under GPL.

README.txt hola.c

CommitA

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");

CommitB

CommitC

-Hello+Hola

CommitD

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

CommitA

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");

CommitB

CommitC

README.txt

hello.c

hola.c (rename)

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hola project.

Licensed under GPL.

README.txt hola.c

CommitA

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");

CommitB

CommitC

-Hello+Hola

CommitD

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

CommitA

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");

CommitB

CommitC

README.txt

hello.c

hola.c (rename)

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hola project.

Licensed under GPL.

README.txt hola.c

CommitA

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");

CommitB

CommitC

-Hello+Hola

CommitD

README.txt

hello.c

hola.c (rename)

(copy)

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

hello.c

5 Haziran 13 Çarşamba

Git Snapshots

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

c3d

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

f13

5 Haziran 13 Çarşamba

#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

5 Haziran 13 Çarşamba

#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

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

c3d

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

f13

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

c3d

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

f13

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

c3d

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

f13

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

c3d

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

f13

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

c3d

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

f13

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hello.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hello project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 hola.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hola project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 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

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hola project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 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

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hola project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 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

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hola project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 hola.c

This is Scott's Hola project.

Licensed under GPL.

84f

CommitD

84f README.txt6d4 hola.c6d4 hello.c

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

hello.c

5 Haziran 13 Çarşamba

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

This is Scott's Hola project.

Licensed under GPL.

README.txt hola.c

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 hola.c

This is Scott's Hola project.

Licensed under GPL.

84f

CommitD

84f README.txt6d4 hola.c6d4 hello.c

#include<stdio.h>

int main(void) { printf("Hola\n"); return 0;}

hello.c

5 Haziran 13 Çarşamba

CommitA

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");

CommitB

CommitC

-Hello+Hola

CommitD

README.txt

hello.c

hola.c (rename)

(copy)

5 Haziran 13 Çarşamba

CommitA

c3d README.txtf13 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

CommitB

c3d README.txt6d4 hello.c

CommitC

c3d README.txt6d4 hola.c

This is Scott's Hola project.

Licensed under GPL.

84f

CommitD

84f README.txt6d4 hola.c6d4 hello.c

CommitA

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");

CommitB

CommitC

-Hello+Hola

CommitD

README.txt

hello.c

hola.c (rename)

(copy)

5 Haziran 13 Çarşamba

First Steps

5 Haziran 13 Çarşamba

$ git config --global user.name “Scott Chacon”

$ git config --global user.email “schacon@gmail.com”

5 Haziran 13 Çarşamba

$ git config --global color.ui true

5 Haziran 13 Çarşamba

5 Haziran 13 Çarşamba

Getting a Repo

5 Haziran 13 Çarşamba

Create One

5 Haziran 13 Çarşamba

git init

5 Haziran 13 Çarşamba

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

5 Haziran 13 Çarşamba

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

5 Haziran 13 Çarşamba

$ 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

$ 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

$ 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

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

5 Haziran 13 Çarşamba

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

5 Haziran 13 Çarşamba

$ 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

$ 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

$ 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

Clone One

5 Haziran 13 Çarşamba

git clone

5 Haziran 13 Çarşamba

$ git clone git://github.com/schacon/ticgit.gitInitialized 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/$ lsLICENSE! ! Rakefile! examples! note! ! ticgit.gemspecREADME!! bin!! lib!! spec$

5 Haziran 13 Çarşamba

$ git clone git://github.com/schacon/ticgit.gitInitialized 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/$ lsLICENSE! ! Rakefile! examples! note! ! ticgit.gemspecREADME!! bin!! lib!! spec$

5 Haziran 13 Çarşamba

$ git clone git://github.com/schacon/ticgit.gitInitialized 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/$ lsLICENSE! ! Rakefile! examples! note! ! ticgit.gemspecREADME!! bin!! lib!! spec$

5 Haziran 13 Çarşamba

$ git clone git://github.com/schacon/ticgit.gitInitialized 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

Recording a Snapshot

5 Haziran 13 Çarşamba

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

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

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

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

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

A Basicerer Workflow

Edit files

Stage and Commit

vim / emacs / etc

git commit -a

5 Haziran 13 Çarşamba

What’s going on here?

5 Haziran 13 Çarşamba

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

5 Haziran 13 Çarşamba

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

5 Haziran 13 Çarşamba

77d3001

5 Haziran 13 Çarşamba

77d3001

5 Haziran 13 Çarşamba

77d3001a1de6bf8f5e431972fe4d25b01e595c0b

5 Haziran 13 Çarşamba

77d3001a1de6bf8f5e431972fe4d25b01e595c0b

5 Haziran 13 Çarşamba

77d3001a1de6bf8f5e431972fe4d25b01e595c0b

5 Haziran 13 Çarşamba

77d3001a1de6bf8f5e431972fe4d25b01e595c0b

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

5 Haziran 13 Çarşamba

77d3001a1de6bf8f5e431972fe4d25b01e595c0b

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

tree c4ec543b0322744e55c5efc9b6c4e449d398dbffparent a149e2160b3f7573768cdc2fce24d0881f3577e1author Scott Chacon <schacon@gmail.com> 1223402504 -0700committer Scott Chacon <schacon@gmail.com> 1223402504 -0700

descriptive commit message

5 Haziran 13 Çarşamba

77d3001a1de6bf8f5e431972fe4d25b01e595c0b

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

5 Haziran 13 Çarşamba

77d3001a1de6bf8f5e431972fe4d25b01e595c0b

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

5 Haziran 13 Çarşamba

77d3001a1de6bf8f5e431972fe4d25b01e595c0b

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5100644 blob 3d5cd3e1fc4424472ea247d1bb5fcfc3809aadab app.yaml100644 blob 1d31bf2dba611ba0de871320b4d73cdc39cc862b index.yaml100644 blob 03e68c28b73e2650bee34763369faf6e029d5053 main.py

5 Haziran 13 Çarşamba

77d3001a1de6bf8f5e431972fe4d25b01e595c0b

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

5 Haziran 13 Çarşamba

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

commit size

tree

parent

author

committerthis is the previous commitand I am very proud of it

2de54

38defScott

Scott

5 Haziran 13 Çarşamba

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

commit size

tree

parent

author

committerthis is the previous commitand I am very proud of it

2de54

38defScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

5 Haziran 13 Çarşamba

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

commit size

tree

parent

author

committerthis is the previous commitand I am very proud of it

2de54

38defScott

Scott

commit size

tree

parent

author

committerthis is the commit before thatand I'm not sure why

2fe65

90ecdScott

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

committerthis is the commit before thatand I'm not sure why

2fe65

90ecdScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

5 Haziran 13 Çarşamba

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

commit size

tree

parent

author

committerthis is the previous commitand I am very proud of it

2de54

38defScott

Scott

commit size

tree

parent

author

committerthis is the commit before thatand I'm not sure why

2fe65

90ecdScott

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

committerthis is the commit before thatand I'm not sure why

2fe65

90ecdScott

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

commit size

ae668..

tree

parent

author

committermy commit message goes hereand it is really, really cool

c4ec5

a149eScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

commit size

tree

parent

author

committerthis is the previous commitand I am very proud of it

2de54

38defScott

Scott

commit size

tree

parent

author

committerthis is the commit before thatand I'm not sure why

2fe65

90ecdScott

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

committerthis is the commit before thatand I'm not sure why

2fe65

90ecdScott

Scott

app.yaml

index.yaml

main.py

./ c4e

03e

1d3

3d5

48e

77d

a14

38d

c4e

3d51d3

03e

f46

23f 30e

67e

32a

5b1

5 Haziran 13 Çarşamba

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

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

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

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

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

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

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

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

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

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

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

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

Branching and Merging

5 Haziran 13 Çarşamba

branches

5 Haziran 13 Çarşamba

brancheslightweight, movablepointers to a commit

C1

branch

5 Haziran 13 Çarşamba

branching

5 Haziran 13 Çarşamba

git branch

5 Haziran 13 Çarşamba

git checkout

5 Haziran 13 Çarşamba

Commit98ca9

master

HEAD

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

5 Haziran 13 Çarşamba

Commit98ca9

master

HEAD

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

5 Haziran 13 Çarşamba

Commit98ca9

master

HEAD

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

5 Haziran 13 Çarşamba

Commit98ca9

master

HEAD

c3d README.txtf13 hello.c

This is Scott's Hello project.

Licensed under GPL.

#include<stdio.h>

int main(void) { printf("Hello\n"); return 0;}

5 Haziran 13 Çarşamba

Commit98ca9

master

HEAD

c3d README.txtf13 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

5 Haziran 13 Çarşamba

Commit98ca9

master

HEAD

c3d README.txtf13 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

5 Haziran 13 Çarşamba

Commit98ca9

master

HEAD

c3d README.txtf13 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

5 Haziran 13 Çarşamba

$ git branch* master i18n

Commit98ca9

master

HEAD

c3d README.txtf13 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

5 Haziran 13 Çarşamba

$ find .git/refs.git/refs.git/refs/heads.git/refs/heads/default.git/refs/heads/experiment

5 Haziran 13 Çarşamba

$ find .git/refs.git/refs.git/refs/heads.git/refs/heads/master.git/refs/heads/i18n

5 Haziran 13 Çarşamba

$ find .git/refs.git/refs.git/refs/heads.git/refs/heads/master.git/refs/heads/i18n

$ cat .git/refs/heads/master98ca909dc9e38af91565082bdf93577ff555489e

5 Haziran 13 Çarşamba

98ca9

a23fe

i18n

master

HEAD

HEAD

5 Haziran 13 Çarşamba

98ca9

a23fe

i18n

master

HEAD

HEAD

git checkout i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

i18n

master

HEAD

HEAD

5 Haziran 13 Çarşamba

98ca9

a23fe

i18n

master

HEAD

HEAD

git commit

5 Haziran 13 Çarşamba

98ca9

a23fe

i18n

master

HEAD

HEAD

git commit

5 Haziran 13 Çarşamba

git commit

98ca9

a23fe

master

i18n

HEAD

5 Haziran 13 Çarşamba

98ca9

a23fe

master

i18n

HEAD

5 Haziran 13 Çarşamba

git commit

98ca9

a23fe

master

i18n

HEAD

5 Haziran 13 Çarşamba

git commit

98ca9

a23fe 3acd1

master

i18n

HEAD

5 Haziran 13 Çarşamba

98ca9

a23fe 3acd1

master

i18n

HEAD

5 Haziran 13 Çarşamba

98ca9

a23fe 3acd1

master

i18n

HEAD

git checkout -b iss53 master

5 Haziran 13 Çarşamba

98ca9

a23fe

iss53

3acd1

master

HEAD

i18n

git checkout -b iss53 master

5 Haziran 13 Çarşamba

98ca9

a23fe

iss53

3acd1

master

HEAD

i18n

git checkout master;git checkout -b iss53

5 Haziran 13 Çarşamba

98ca9

a23fe

iss53

3acd1

master

HEAD

i18n

git checkout master;git branch iss53; git checkout iss53

5 Haziran 13 Çarşamba

98ca9

a23fe

iss53

3acd1

master

HEAD

i18n

git checkout -b iss53 master

5 Haziran 13 Çarşamba

98ca9

a23fe

iss53

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

git commit

98ca9

a23fe

iss53

34ac2

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

iss53

34ac2

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

git commit

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c43d issue.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txtf13 hello.cd3a i18n.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c43d issue.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txtf13 hello.cd3a i18n.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c43d issue.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txtf13 hello.cd3a i18n.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c43d issue.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txtf13 hello.cd3a i18n.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c43d issue.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txtf13 hello.cd3a i18n.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c43d issue.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txtf13 hello.cd3a i18n.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

merging

5 Haziran 13 Çarşamba

git merge

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

git checkout master

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

git merge iss53

5 Haziran 13 Çarşamba

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

fast-forward merge

5 Haziran 13 Çarşamba

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

git merge iss53

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

5 Haziran 13 Çarşamba

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

non fast-forward merge

5 Haziran 13 Çarşamba

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

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

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.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

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.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

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.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

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.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

95c41c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

git merge i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

95c41c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

git merge i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

95c41c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

95c41c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

95c41c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

95c41c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

95c41c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

c3d README.txtf13 hello.c

c3d README.txtf13 hello.c5ff issue.c

c3d README.txt9ec hello.c3a6 i18n.c

95c41c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

5 Haziran 13 Çarşamba

merge conflicts

5 Haziran 13 Çarşamba

$ git merge iss53Auto-merging index.htmlCONFLICT (content): Merge conflict in index.htmlAutomatic merge failed; fix conflicts and then commit the result.

5 Haziran 13 Çarşamba

$ git merge iss53Auto-merging index.htmlCONFLICT (content): Merge conflict in index.htmlAutomatic merge failed; fix conflicts and then commit the result.

5 Haziran 13 Çarşamba

$ git merge iss53Auto-merging index.htmlCONFLICT (content): Merge conflict in index.htmlAutomatic merge failed; fix conflicts and then commit the result.

$ git statusindex.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

<<<<<<< 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

$ git add [file]

5 Haziran 13 Çarşamba

$ git status# On branch master# Changes to be committed:# (use "git reset HEAD <file>..." to unstage)##!modified: index.html#

5 Haziran 13 Çarşamba

git mergetool

5 Haziran 13 Çarşamba

$ git mergetoolmerge tool candidates: kdiff3 tkdiff xxdiff meld gvimdiff opendiff emerge vimdiffMerging the files: index.html

Normal merge conflict for 'index.html': {local}: modified {remote}: modifiedHit return to start merge resolution tool (opendiff):

5 Haziran 13 Çarşamba

$ git commit

5 Haziran 13 Çarşamba

reintegration merges

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

git checkout i18n

5 Haziran 13 Çarşamba

git commit

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

5 Haziran 13 Çarşamba

git checkout master

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

5 Haziran 13 Çarşamba

git merge i18n

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

git merge i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23c3d README.txt9ec hello.c3a6 i18n.c

c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

45d README.txt9ec hello.c3a6 i18n.c

git merge i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23c3d README.txt9ec hello.c3a6 i18n.c

c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

45d README.txt9ec hello.c3a6 i18n.c

git merge i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23c3d README.txt9ec hello.c3a6 i18n.c

c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

45d README.txt9ec hello.c3a6 i18n.c

git merge i18n

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23c3d README.txt9ec hello.c3a6 i18n.c

c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

45d README.txt9ec hello.c3a6 i18n.c

git merge i18n

5 Haziran 13 Çarşamba

67a2d

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23c3d README.txt9ec hello.c3a6 i18n.c

c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

45d README.txt9ec hello.c3a6 i18n.c

45d README.txt9ec hello.c5ff issue.c3a6 i18n.c

git merge i18n

5 Haziran 13 Çarşamba

67a2d

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23c3d README.txt9ec hello.c3a6 i18n.c

c3d README.txt9ec hello.c5ff issue.c3a6 i18n.c

45d README.txt9ec hello.c3a6 i18n.c

45d README.txt9ec hello.c5ff issue.c3a6 i18n.c

git merge i18n

5 Haziran 13 Çarşamba

git merge i18n

67a2d

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

5 Haziran 13 Çarşamba

Why is this cool?

5 Haziran 13 Çarşamba

try out an idea

5 Haziran 13 Çarşamba

isolate work units

5 Haziran 13 Çarşamba

long running topics

5 Haziran 13 Çarşamba

long running topicscontinuous merging

5 Haziran 13 Çarşamba

Deleting Branches

5 Haziran 13 Çarşamba

git branch -d branch

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

5 Haziran 13 Çarşamba

98ca9

a23fe

f30ab

iss53

34ac2

3acd1

master

HEAD

i18n

95c41

4fa23

5 Haziran 13 Çarşamba

git branch -D branch

5 Haziran 13 Çarşamba

Collaborating

5 Haziran 13 Çarşamba

remotes

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

git clone nick@git.ourcompany.com:project.git

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

git clone nick@git.ourcompany.com:project.git

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

git clone nick@git.ourcompany.com:project.git

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

git clone scott@git.ourcompany.com:project.git

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

5 Haziran 13 Çarşamba

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

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git commit

5 Haziran 13 Çarşamba

git push

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git push origin master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git push origin master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git push origin master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git push origin master

i want to push some new stuff

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git push origin masteri’ve got master at 31b8

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git push origin master

cool, i see that in the history of what i

want to push

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git push origin masterhere’s the difference

dee9 9e05

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git push origin master

dee9 9e05

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

git push origin master

dee9 9e05

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

ok, everything looks good.

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

git push origin master

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

git push origin master

i want to push some new stuff

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

git push origin masteri’ve got master at 9e05

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

git push origin master

not familiar with that

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

git push origin master

crap.

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 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

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

origin/master

5 Haziran 13 Çarşamba

git fetch

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05dee9 9e05

git fetch

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

git fetch

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

git merge origin/master

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

git push origin master

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 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

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

git push origin masteri’ve got master at 9e05

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 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

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

git push origin masterlet’s do this

e1cf 8091 a967

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

git push origin master

e1cf 8091 a967

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

git push origin master

e1cf 8091 a967

origin/master

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

origin/master

ok, we’re good.

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

master

master

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

5 Haziran 13 Çarşamba

pushing other branches

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

5 Haziran 13 Çarşamba

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

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

5 Haziran 13 Çarşamba

git push origin iss53

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

5 Haziran 13 Çarşamba

git push origin iss53

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

i want to push some stuff

5 Haziran 13 Çarşamba

git push origin iss53

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

i’ve got master at a967

5 Haziran 13 Çarşamba

git push origin iss53

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

i don’t care

5 Haziran 13 Çarşamba

git push origin iss53

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

i’m trying to push iss53

5 Haziran 13 Çarşamba

git push origin iss53

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

here you go

5 Haziran 13 Çarşamba

git push origin iss53

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

4ca2 74ba

5 Haziran 13 Çarşamba

git push origin iss53

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

4ca2 74ba

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

4ca2 74ba iss53

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

4ca2 74ba iss53

git fetch

4ca2 74ba

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

4ca2 74ba iss53

git fetch

4ca2 74ba

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

4ca2 74ba iss53

git fetch

4ca2 74ba

5 Haziran 13 Çarşamba

git.ourcompany.com

Nick's Computer

origin/master

f42c 31b8

Scott's Computer

origin/master

f42c 31b8

f42c 31b8

master

mastermaster

dee9 9e05e1cf 8091

dee9 9e05

dee9 9e05

a967

a967e1cf 8091

4ca2 74ba

iss53

4ca2 74ba iss53

4ca2 74ba

origin/iss53

5 Haziran 13 Çarşamba

git pull

5 Haziran 13 Çarşamba

pull == fetch + merge

5 Haziran 13 Çarşamba

multiple remotes

5 Haziran 13 Çarşamba

developernick

developerjessica

my repo5ec

e4a4a7ce0 master

5 Haziran 13 Çarşamba

developernick

developerjessica

my repo5ec

e4a4a7ce0 master

commit

5 Haziran 13 Çarşamba

developernick

developerjessica

my repo5ec

e4a4a7ce0 master

tree

5 Haziran 13 Çarşamba

developernick

developerjessica

my repo5ec

e4a4a7ce0 master

blobs

5 Haziran 13 Çarşamba

schacon/project

developernick

developerjessica

"public"

my repo5ec

e4a4a7ce0 master

git push public

public/master

5ece4a

4a7ce0

5 Haziran 13 Çarşamba

schacon/project

developerjessica

"public"

my repo5ec

e4a4a7ce0 master

git clone (url)

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nick

5 Haziran 13 Çarşamba

schacon/project

developerjessica

"public"

my repo5ec

e4a4a7ce0 master

git commit

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f git clone (url)

5ece4a

4a7ce0developer

jessica

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09git commit

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09git push

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git remote add nick git://github.com/nickh/project.git

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick"

git remote add nick git://github.com/nickh/project.git

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git remote add nick git://github.com/nickh/project.git

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick"“nick”

git remote add nick git://github.com/nickh/project.git

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git remote add jess git://github.com/jessica/project.git

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

git remote add jess git://github.com/jessica/project.git5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git remote add jess git://github.com/jessica/project.git

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

git remote add jess git://github.com/jessica/project.git

“jess”

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git remote add jess git://github.com/jessica/project.git

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git fetch nick

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

c12ec524f nick/master

git fetch nick5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git remote add jess git://github.com/jessica/project.git

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git fetch nick

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

c12ec524f nick/master

git fetch nick5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git fetch nick

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

c12ec524f nick/master

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git remote add jess git://github.com/jessica/project.git

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

git fetch jess

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git fetch jess

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

ec524f nick/master

2fbdf74eaa09

jess/masterc12

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git fetch nick

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

c12ec524f nick/master

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git remote add jess git://github.com/jessica/project.git

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

git fetch jess

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git fetch jess

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

ec524f nick/master

2fbdf74eaa09

jess/masterc12

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git fetch nick

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

c12ec524f nick/master

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0 master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git fetch jess

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

ec524f nick/master

2fbdf74eaa09

jess/masterc12

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0

master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

ec524f nick/master

2fbdf74eaa09

jess/masterc12

b3bc63

git merge nick jessgit merge nick/master jess/master5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0

master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

git push public

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

ec524f nick/master

2fbdf74eaa09

jess/masterc12

b3bc63

e4aec524f

2fbdf74eaa09

c12

b3bc63

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0

master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

ec524f nick/master

2fbdf74eaa09

jess/masterc12

b3bc63

e4aec524f

2fbdf74eaa09

c12

b3bc63

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0

master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

ec524f nick/master

2fbdf74eaa09

jess/masterc12

b3bc63

e4aec524f

2fbdf74eaa09

c12

b3bc63

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0

master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

ec524f nick/master

2fbdf74eaa09

jess/masterc12

b3bc63

e4aec524f

2fbdf74eaa09

c12

b3bc63

5 Haziran 13 Çarşamba

schacon/project

"public"

my repo5ec

e4a4a7ce0

master

public/master

5ece4a

4a7ce0

5ece4a

4a7ce0developer

nickc12ec524f

5ece4a

4a7ce0developer

jessica2fbdf74ea

a09

5ece4a

4a7ce0nickh/project

c12ec524f

5ece4a

4a7ce0jessica/project

2fbdf74eaa09"nick" "jess"

ec524f nick/master

2fbdf74eaa09

jess/masterc12

b3bc63

e4aec524f

2fbdf74eaa09

c12

b3bc63

5 Haziran 13 Çarşamba

Git Repository Yönetimi

StashGitoliteGitosis

Şirketiçi Hosted

GitHubGitoriousBitbucket

5 Haziran 13 Çarşamba

Referanslar

git-scm.com

Tech Talk: Linus Torvalds on Git

Introduction to Git: Scott Chacon

5 Haziran 13 Çarşamba