The GitHub Panel

8/14/2019 The GitHub Panel

1/414

Smacking Git Aroundby Scott Chacon


2/414

Me


3/414

Scott Chacon


4/414


5/414

github.com/schacon


6/414

Scott Chacon has anunderstandable but borderline

unhealthy obsession with Git

- Ilya Grigorik

igvita.com


7/414

git-scm.com


8/414


9/414


10/414

book.git-scm.com


11/414

[email protected]


12/414


13/414

previously, on Git...


14/414

GIT


15/414

Git


16/414


17/414image by matthew mccullough


18/414

Scott

v1

Scott ChaconScott Chacon

is a Git

v2 v3


19/414


20/414

commit size

98ca9..

tree

author

committer

initial commit of my project

0de24

Scott

Scott

commit size

34ac2..

tree

parent

author

committer

fixed bug #1328 - stack

overflow under certain

184ca

98ca9

Scott

Scott

commit size

f30ab..

tree

parent

author

committer

add feature #32 - ability to

add new formats to the central

92ec2

34ac2

Scott

Scott

snapshot A snapshot B snapshot C


21/414

blob

size

e8455..commit size

98ca9..

== LICENSE:

(The MIT License)

Copyright (c) 2007 Tom Preston-

Permission is hereby granted, f

ree of charge, to any person ob

tree

parent

author

committer

my commit message goes here

and it is really, really cool

0de24

nil

Scott

Scott

tree size

10af9..

blob

tree

bc52a

b70f8

mylib.rb

inc

tree

size

b70f8..

blob 0ad1a tricks.rb

tree size0de24..

blob

tree

e8455

10af9

README

lib

blobsize

bc52a..

require 'grit/index'

require 'grit/status'

module Grit

class


22/414

blob

size

e8455..commit size

98ca9..

== LICENSE:

(The MIT License)

Copyright (c) 2007 Tom Preston-

Permission is hereby granted, f

ree of charge, to any person ob

tree

parent

author

committer

my commit message goes here

and it is really, really cool

0de24

nil

Scott

Scott

tree size

10af9..

blob

tree

bc52a

b70f8

mylib.rb

inc

tree size

b70f8..

blob 0ad1a tricks.rb

tree size0de24..

blob

tree

e8455

10af9

README

lib

blobsize

bc52a..

require 'grit/index'

require 'grit/status'

module Grit

class


23/414

0de24..22d8858e8513666bf91b82bd2939ec7b0d1974da


24/414


25/414

98ca9

a23fe

f30ab

master

34ac2

3acd1

topic

stable


26/414

98ca9

a23fe

f30ab

master

34ac2

3acd1

topic

stable


27/414

98ca9

a23fe

f30ab

master

34ac2

3acd1

topic

stable


28/414

98ca9

a23fe

f30ab

master

34ac2

3acd1

topic

stable


29/414

$ time git checkout -b newbranch

Switched to a new branch "newbranch"

real! 0m0.040suser! 0m0.003ssys!0m0.008s


30/414

$ time git checkout -b newbranch

Switched to a new branch "newbranch"

real! 0m0.040suser! 0m0.003ssys!0m0.008s


31/414


32/414

master

develop

topic


33/414


34/414

distributeddevelopment

image by matthew mccullough

ccf03da00eca1b60a489354c1278c27f1fbc55dc


35/414

ccf03da00eca1b60a489354c1278c27f1fbc55dc

a640106f173c5be59ed5757cf33f568b3e10994fc51a137df64b8ed2f8d84ad62df7b49b1c409906

7e06f7f8d471d5ccbe958fcfaef0fc48ff1a3defdafe95908f7b9cbd2697f04544b68904a6c59aac2934b685f5dfd2b12c5d7d35d07c6058640f0581

d3b47a90ef9bf2d7bbc5a7cf2b2f27eef4a08f04

dbfeee0f5717d9978788da17cd6853316c92744a864734938d4044fc5e713e4818f60ecb4f4605253793a0108438a539f958236dbb9f4ea98b6b70ea

00a60fa1439f082128c1ec03ec3c73acab074d31

6ba82b4879f04de35ffe2ef02d50df0adf184fad861020b6afeeec245afa2f864c72f5c2588295be

505f3128a573bfe1d23aec2acef83c34c3cbd8be213e6f8761df038ab0b7c34a9fc4c2c3ce6c8b43

798a8088bcc7cf47fdb33a9d79e398220b660f88


36/414


37/414


38/414

C


39/414

fast


40/414

efficient


41/414


42/414

100k repos


43/414

80k users


44/414


45/414


46/414

Git Tips and Tricks


47/414

Tips and Tricks

Selection and Ranges

Data Munging

DebuggingCustomizing


48/414

Selection and Ranges


49/414

Revision Selection


50/414

Revision Selection

alternate ways to refer toobjects or ranges of objects


51/414

Revision Selection

full sha-1

partial sha-1

branch or tag namecaret parent

tilde spec

blob spec

relative specs

ranges


52/414

Full SHA1

6e453f523fa1da50ecb04431101112b3611c6a4d


53/414

Partial SHA16e453f523fa1da50ecb04431101112b3611c6a4d

6e453f523fa1da50

6e453


54/414


55/414

Caret Parent

default^2

2nd parent of default


56/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")


57/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

master^


58/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

master^2


59/414


60/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

master~2

t ^^^2


61/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

master^^^2

master~2^2

t ^^^2


62/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

master^^^2

master~2^2

t ^^^2


63/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

master^^^2

master~2^2


64/414

Blob Spec

default:path/to/file

blob of that file in default commit


65/414

Relative Specs

master@{yesterday}

the commit master was at yesterday


66/414

Relative Specs

master@{5}

the 5th prior value of master (locally)


67/414

Ranges


68/414

Ranges

ce0e4..e4272

every commit reachable by e4272

that is not reachable by ce034


69/414

Ranges

[old]..[new]

every commit reachable by [new]

that is not reachable by [old]


70/414

Ranges

ce0e4..

everything since a commit


71/414

Reachability


72/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

jess/master..master


73/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

jess/master..master


74/414


75/414


76/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

jess/master..master


77/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

jess/master..master


78/414

jess/master..master

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")


79/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

jess/master..master


80/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

jess/master..c36ae


81/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

jess/master..c36ae


82/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

jess/master..c36ae


83/414

!"#"$

%&'(")

*"!$+ ,-$*" $"&.- ,-//0 12!&"

/0/"1 !4 .-,-& !04&"

5"''6%&'(")

jess/master..c36ae


84/414

Advanced Log


85/414

Log Subsets


86/414

what am I going topush?


87/414

git log origin/master..


88/414

C1

C0

origin/master master HEAD


89/414

C1

C0

C2

C3

C4

origin/master

master HEAD


90/414

C1

C0

C2

C3

C4origin/master master HEAD

C5

C6

C7

git fetch origin


91/414

C1

C0

C2

C3


C5

C6

C7



92/414

C1

C0

C2

C3


C5

C6

C7

git logorigin/master..HEAD


93/414

C1

C0

C2

C3


C5

C6

C7



94/414


95/414

C1

C0

C2

C3


C5

C6

C7


commit 72d404debaa804fca82fd9cf710fbde48c7305c6

Author: Shawn O. Pearce

Date: Sun Oct 12 13:13:59 2008 -0700


96/414

test-lib: fix broken printf

b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of

printf without a format string.

Signed-off-by: Shawn O. Pearce

commit 969c877506cf8cc760c7b251fef6c5b6850bfc19

Author: Jeff King

Date: Sun Oct 12 00:06:11 2008 -0400

git apply --directory broken for new files

We carefully verify that the input to git-apply is sane,

including cross-checking that the filenames we see in "+++"

headers match what was provided on the command line of "diff

--git". When --directory is used, however, we ended up

comparing the unadorned name to one with the prepended root,

causing us to complain about a mismatch.

We simply need to prepend the root directory, if any, whenpulling the name out of the git header.

commit ff74126c03a8dfd04e7533573a5c420f2a7112ac

Author: Johannes Schindelin

Date: Fri Oct 10 13:42:12 2008 +0200

rebase -i: do not fail when there is no commit to cherry-pick

commit 72d404debaa804fca82fd9cf710fbde48c7305c6

Author: Shawn O. Pearce

Date: Sun Oct 12 13:13:59 2008 -0700

C4


97/414


b8eecafd888d219633f4c29e8b6a90fc21a46dfd introduced usage of

printf without a format string.

Signed-off-by: Shawn O. Pearce

commit 969c877506cf8cc760c7b251fef6c5b6850bfc19

Author: Jeff King

Date: Sun Oct 12 00:06:11 2008 -0400


We carefully verify that the input to git-apply is sane,

including cross-checking that the filenames we see in "+++"

headers match what was provided on the command line of "diff

--git". When --directory is used, however, we ended up

comparing the unadorned name to one with the prepended root,

causing us to complain about a mismatch.

We simply need to prepend the root directory, if any, whenpulling the name out of the git header.

commit ff74126c03a8dfd04e7533573a5c420f2a7112ac

Author: Johannes Schindelin

Date: Fri Oct 10 13:42:12 2008 +0200

rebase -i: do not fail when there is no commit to cherry-pick

C2

C3


98/414

C1

C0

C2

C3


C5

C6

C7

git logHEADorigin/master ..


99/414

C1

C0

C2

C3


C5

C6

C7

git logHEAD origin/master..


100/414

C1

C0

C2

C3


C5

C6

C7

git logHEAD origin/master..

commits in origin/master

not in HEAD


101/414


git log origin/master..HEAD

git log origin/master..master

git log master ^origin/master

git log master --not origin/master


102/414

git log HEAD ^origin/master


103/414

git log HEAD ^origin/master


104/414

git log master topic1 ^origin/master


105/414

C1

C0

origin/master


106/414

C1

C0

C3

master

origin/master


107/414

C1

C0

C3

C8

C9

master

experiment

C10

origin/master


108/414

C1

C0

C2

C6

C7

C3

C4 C8

C9C5

origin/mastermaster

experiment

C10


109/414

which changes arent inexperiment?

git log origin/master master ^experiment


110/414

C1

C0

C2

C6

C7

C3

C4 C8

C9C5

origin/mastermaster

experiment

C10



111/414

C1

C0

C2

C6

C7

C3

C4 C8

C9C5

origin/mastermaster

experiment

C10



112/414

C1

C0

C2

C6

C7

C3

C4 C8

C9C5

origin/mastermaster

experiment

C10



113/414

C1

C0

C2

C6

C7

C3

C4 C8

C9C5

origin/mastermaster

experiment

C10



114/414

C1

C0

C2

C6

C7

C3

C4 C8

C9C5

origin/mastermaster

experiment

C10



115/414

C1

C0

C2

C6

C7

C3

C4 C8

C9C5

origin/mastermaster

experiment

C10



116/414

C1

C0

C2

C6

C7

C3

C4 C8

C9C5

origin/mastermaster

experiment

C10


117/414

git log --graph

git log --pretty=oneline --graph


118/414

gitk


119/414

gitk 6d13f..41aba


120/414


121/414

Revision Diffs


122/414

git diff revA revB

$ echo version one > test$ i dd


123/414

C1

master

$ git add test$ git commit -m C1

$ git checkout -b topic


124/414

g p

$ echo version two >> test

$ git commit -m C2

C1

C2master

topic

$ echo version three >> test


125/414

$ git commit -m C3

C1

C2

C3

master

topic

$ git checkout master

$ echo version four >> test


126/414

$$ git commit -m C4

C1

C4 C2

C3

master

topic

$ echo version five >> test$ it it C5


127/414

$ git commit -m C5

C1

C4

C5

C2

C3

master topic


128/414

C1

C4

C5

C2

C3

master topic

$ git diff topic


129/414

$ git diff topic

C1

C4

C5

C2

C3

master topic

what does topic have

that I dont have?


130/414

$ git diff topic

C1

C4

C5

C2

C3

master topic

what would happen if I

merged in topic?


131/414

$ git diff topic

C1

C4

C5

C2

C3

master topic

how do I make topic

look like HEAD?


132/414

$ git diff topic

C1

C4

C5

C2

C3

master topicdiff --git a/test b/test

index 304313d..bd8c6c9 100644--- a/test

+++ b/test@@ -1,3 +1,3 @@

version one-version two

-version three+version four

+version five


133/414

$ git diff topic

C1

C4

C5

C2

C3


index 304313d..bd8c6c9 100644--- a/test

+++ b/test@@ -1,3 +1,3 @@

version one-version two

-version three+version four

+version five


134/414

$ git diff HEAD topic

C1

C4

C5

C2

C3


index bd8c6c9..304313d 100644--- a/test

+++ b/test@@ -1,3 +1,3 @@

version one-version four

-version five+version two

+version three


135/414


C1

C4

C5

C2

C3


index bd8c6c9..304313d 100644--- a/test

+++ b/test@@ -1,3 +1,3 @@

version one-version four

-version five+version two

+version three


136/414

git diff HEAD topic


137/414

git diff HEAD...topic


138/414

git diff HEAD...topic



139/414


C1

C4

C5

C2

C3

master topic



140/414


C1

C4

C5

C2

C3

master topic


141/414



142/414

$ git diff HEAD...topic

C1

C4

C5

C2

C3

master topic

diff --git a/test b/testindex 9bc69cf..304313d 100644--- a/test

+++ b/test@@ -1 +1,3 @@

version one+version two

+version three



143/414

$ git diff HEAD...topic

C1

C4

C5

C2

C3

master topic

diff --git a/test b/testindex 9bc69cf..304313d 100644--- a/test

+++ b/test@@ -1 +1,3 @@

version one+version two

+version three

what would happen if I

merged in topic?


144/414

Data Munging


145/414

Rewriting History


146/414

Modifying the last commit


147/414

git commit --amend


148/414

Rebasing


149/414

C1

C4

C5

C2

C3

master topic

topic


150/414

git merge masterC1

C4

C5

C2

C3

master C6


151/414

C1

C4

C5

C2

C3

master topic

git rebase master


152/414

C1

C4

C5

C2

C3

master topic

git rebase master


153/414


154/414

C1

C4

C5

C2

C3

master topic

git rebase master


155/414

C1

C4

C5

C2

C3

master topic

git diff c2 c3 > 2-3.patch


156/414

diff --git a/test b/test

index 2eadcec..bd8c6c9 100644

--- a/test

+++ b/test

@@ -1,2 +1,3 @@

version oneversion four

+version fiveC1

C4

C5

C2

C3

master topic



157/414

2-3.patch

C1

C4

C5

C2

C3

master topic


158/414

2-3.patch

C1

C4

C5

C2

C3

master topic



159/414

2-3.patch

C1

C4

C5

C2

C3

master topic

git diff c1 c2 > 1-2.patch1-2.patch


160/414

1-2.patch

2-3.patch

C1

C4

C5

C2

C3

master topic

git rebase master


161/414

1-2.patch

2-3.patch

C1

C4

C5

C2

C3

master topic

git rebase master


162/414

2-3.patch

C1

C4

C5

C2

C3

master topic1-2.patch

git rebase master

topic


163/414

2-3.patch

C1

C4

C5

C2

C3

masterC2'

2-3.patchgit rebase master

topic


164/414

C1

C4

C5

C2

C3

masterC2'

git rebase mastertopic

C3'


165/414

C1

C4

C5

C2

C3

masterC2'

C3

topic


166/414

git rebase master

C1

C4

C5

C2

C3

masterC2'

C3'


167/414

topic

topic


168/414

C1

C4

C5master

C2'

C3'

git rebase masterC2'

C3'

C1

C4

C5master


169/414

Fun with Rebasing


170/414

rebase --onto


171/414

Transplanting TopicBranches

master


172/414

C1 C2

master


173/414

C1 C2C1 C2

C3

server

master


174/414

C1 C2

C3

C8 C9

client

C1 C2

server

master


175/414

C1 C2

server

C3 C4

C8

C10

C9

client

master


176/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client


177/414

move your client

branch work to yourmaster branch

master


178/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client


179/414

master


180/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client

git rebase master

master


181/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client

git rebase master

master


182/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client

git rebase master


183/414

master


184/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client

git rebase server


185/414

master


186/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client

git rebase server

master


187/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client

git rebase server

master


188/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client

git rebase --onto master server

master


189/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client


master


190/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client


master


191/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client

C8 C9


master

clientmaster


192/414

C8 C9C1 C2 C5

server

C3 C4

C6

C8

C10

C9

C8' C9'C1 C2 C5

server

C3 C4

C6

C8

C10

C9

client

master client


193/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

C8' C9'

master client


194/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

C8' C9'

git checkout server

git rebase master

master client


195/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

C8' C9'

git checkout server

git rebase client

master client


196/414

C1 C2 C5

server

C3 C4

C6

C8

C10

C9

C8' C9'

git checkout server

git rebase client


197/414

client

client servermaster


198/414

git checkout server

git rebase client

C1 C2 C5 C6 C8' C9' C3' C4' C10'C1 C2 C5 C6 C8' C9' C3' C4' C10'

client servermaster


199/414

C1 C2 C5 C6 C8' C9' C3' C4' C10'

git checkout server

git rebase client


200/414

transplant some of a

topic branch

master


201/414

C1C0 C2

C3

topic

C4 C5

master


202/414

C1C0 C2

C3

topic

C4 C5

master


203/414

git branch newtopic C3

C1C0 C2

C3

topic

C4 C5

master


204/414


newtopic

C1C0 C2

C3

topic

C4 C5

master


205/414


git rebase --onto master newtopic

newtopic

C1C0 C2

C3

topic

C4 C5

master topic


206/414

C1C0 C2

C3 C4 C5

C4' C5'


git rebase --onto master newtopic

newtopic


207/414

Fixing a commit

several back


208/414

git rebase -igit rebase --interactive


209/414

C4

default


210/414

C1

C0

C2

C3

C4

default


211/414

C1

C0

C2

C3

default~2

C4

default


212/414

C1

C0

C2

C3

default~2


213/414

git rebase -i default~2^


214/414



215/414


pick 969c877 git apply --directory broken for new files

pick b75271d git diff {3,}: do not reverse order of args

pick 72d404d test-lib: fix broken printf

# Rebase f285a2d 5c283eb onto f285a2d


216/414

# Rebase f285a2d..5c283eb onto f285a2d

#

# Commands:

# p, pick = use commit

# e, edit = use commit, but stop for amending

# s, squash = use commit, but meld into previous commit

#

# If you remove a line here THAT COMMIT WILL BE LOST.# However, if you remove everything, the rebase will be aborted.

#

~

~

~

~~

"~/projects/git/.git/rebase-merge/git-rebase-todo" 14L, 472C





C2

C3

C4


217/414


#

# Commands:




#


#

~

~

~

~~







218/414


#

# Commands:




#


#

~

~

~

~~







219/414


#

# Commands:




#


#

~

~

~

~~







220/414


#

# Commands:




#


#

~

~

~

~~



221/414






222/414


#

# Commands:




#


#

~

~

~

~~


edit 969c877 git apply --directory broken for new files





223/414


#

# Commands:




#


#

~

~

~

~~


$ git rebase -i default~2^

Stopped at 969c877... git apply --directory broken for new files

You can amend the commit now, with

git commit --amend


224/414

g

Once you are satisfied with your changes, run

git rebase --continue

$_




git commit --amend


225/414



$_

edit filesgit add

git commit --amendgit rebase --continue




git commit --amend


226/414



$_

edit filesgit add





git commit --amend


227/414



$_

edit filesgit add





git commit --amend


228/414



$_

edit filesgit add


C4

default

C4'


229/414

C1

C0

C2

C3

C2'

C3'

C4

default

C4'


230/414

C1

C0

C2

C3

C2'

C3'

C4

default

C4'


231/414

C1

C0

C2

C3

C2'

C3'


232/414

Squashing commits

together






233/414

## Commands:




#


#

~

~

~

~~



squash b75271d git diff {3,}: do not reverse order of args

squash 72d404d test-lib: fix broken printf



234/414

## Commands:




#


#

~

~

~

~~


# This is a combination of 3 commits.# The first commit's message is:


# This is the 2nd commit message:

git diff {3,}: do not reverse order of args


235/414

# This is the 3rd commit message:


# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

#

# Author: Jeff King

#

# Not currently on any branch.

# Changes to be committed:

# (use "git reset HEAD ..." to unstage)

#

# modified: builtin-apply.c

# modified: builtin-diff.c

# modified: t/t4013-diff-various.sh

# new file: t/t4013/diff.diff_master_master^_side

# modified: t/t4128-apply-root.sh# modified: t/test-lib.sh

#

~

~

".git/COMMIT_EDITMSG" 39L, 1454C






236/414





#

# Author: Jeff King

#




#






#

~

~







237/414





#

# Author: Jeff King

#




#






#

~

~







238/414





#

# Author: Jeff King

#




#






#

~

~


C4


239/414

C1

C0

C2

C3

default

C5


240/414

scott jessica


241/414

C1

C0

default

scott jessica


242/414

C0

default

C1

C0

scott/default

default

C2

C3

C4

C1

scott jessica


243/414

C0

C5

C6

C7

default

C1

C0

scott/default default

C2

C3

C4

C1

C5

C6

C7

scott jessica

default


244/414

C0

C5

C6

C7

default

C1

C0

scott/default

C2

C3

C4

C1

C5

C6

C7

C8

scott jessica

default


245/414

C0

C5

C6

C7

default

C1

C0

scott/default

C2

C3

C4

C1

C5

C6

C7

C5'

C6'

C7'

C8


246/414

scott jessica

default

C9


247/414

C0

C5

C6

C7

default

C1

C0

scott/default

C2

C3

C4

C1

C5

C6

C7

C5'

C6'

C7'

C8

C5'

C6'

C7'


248/414

Filter BranchHistory Revision on Steroids


249/414

remove all instances of a

file from every commit


250/414

git filter-branch--tree-filter 'rm -f filename'

HEAD


251/414

change your email

in all commits


252/414

git filter-branch --env-filter

"export [email protected]"HEAD
mailto:[email protected]:[email protected]


253/414

git filter-branch --env-filter

"export [email protected]"origin/master..HEAD
mailto:[email protected]:[email protected]


254/414

Subtree Merging


255/414

Alternative to

Submodules

$ lsREADME! ! rack_app.rb$ git remote add rack_remote [email protected]:schacon/rack.git$ git fetch rack_remotewarning: no common commits

t C ti bj t 3184 d


256/414

remote: Counting objects: 3184, done.remote: Compressing objects: 100% (1465/1465), done.remote: Total 3184 (delta 1952), reused 2770 (delta 1675)Receiving objects: 100% (3184/3184), 677.42 KiB | 4 KiB/s, d

Resolving deltas: 100% (1952/1952), done.From [email protected]:schacon/rack* [new branch] master -> rack_remote/master$ git checkout -b rack_branch rack_remote/masterBranch rack_branch set up to track remote branch refs/remote

Switched to a new branch "rack_branch"$ lsAUTHORS!! KNOWN-ISSUES! Rakefile!contrib!! libCOPYING!! README! ! bin! ! example!! test

t


257/414

C1

C0

master

C2

C3

$ lsREADME! ! rack_app.rb$ git remote add rack_remote [email protected]:schacon/rack.git$ git fetch rack_remotewarning: no common commits

t C ti bj t 3184 d


258/414




$ lsREADME! ! rack_app.rb$ git remote add rack_remote [email protected]:schacon/rack.git$ git fetch rack_remotewarning: no common commitsremote: Co nting objects: 3184 done


259/414




$ lsREADME! ! rack_app.rb$ git remote add rack_remote [email protected]:schacon/rack.git$ git fetch rack_remotewarning: no common commitsremote: Counting objects: 3184 done


260/414






261/414






262/414






263/414

remote: Counting objects: 3184, done.remote: Compressing objects: 100% (1465/1465), done.remote: Total 3184 (delta 1952), reused 2770 (delta 1675)Receiving objects: 100% (3184/3184), 677.42 KiB | 4 KiB/s, dResolving deltas: 100% (1952/1952), done.From [email protected]:schacon/rack* [new branch] master -> rack_remote/master$ git checkout -b rack_branch rack_remote/masterBranch rack_branch set up to track remote branch refs/remote




264/414





265/414



master


266/414

C1

C0

C2

C4

rack_branch

C5

C6

C3

rack_remote/master



267/414

$ git checkout master$ lsREADME!! rack_app.rb$ git checkout rack_branch

$ lsAUTHORS! ! KNOWN-ISSUES!Rakefile! contrib!! libCOPYING! ! README!! bin! ! example!! test



268/414





269/414





270/414




271/414

checkout rack

into my project

$ git read-tree --prefix=rack/ -u rack_branch$ lsREADME!! rack!! rack_app.rb$ ls rackAUTHORS KNOWN ISSUES Rakefile contrib lib


272/414

AUTHORS! ! KNOWN-ISSUES!Rakefile!contrib! ! libCOPYING! ! README!! bin! ! example! ! tes$ git add rack

$ git commit -m 'added rack code'[master 0839fd8] added rack code108 files changed, 10334 insertions(+), 0 delcreate mode 100644 rack/AUTHORS

create mode 100644 rack/COPYING...

create mode 100644 rack/test/testrequest.rb



273/414







274/414





$ git read-tree --prefix=rack/ -u rack_branch$ lsREADME!! rack!! rack_app.rb$ ls rackAUTHORS KNOWN-ISSUES Rakefile contrib lib


275/414







276/414







277/414






278/414

edit a file in rack

$ vim rack/lib/rack.rb$ git commit -am 'added awesome to rack'

[master b1b77ee] added awesome to rack

1 files changed, 1 insertions(+), 0 deletions(-)

$ git checkout rack branch


279/414

$ git checkout rack_branch$ git merge --squash -s subtree --no-commit master

Squash commit -- not updating HEAD

Automatic merge went well; stopped before committi

$ git status# On branch rack_branch# Changes to be committed:


##! modified: lib/rack.rb#






280/414












281/414








282/414

submit the change

back to rack




$ git checkout rack_branch$


283/414

$ g _$ git merge --squash -s subtree --no-commit master







284/414

git merge -s subtree




$ git checkout rack_branch$ i b i h


285/414

g$ git merge -s subtree --no-commit --squash master









$ git checkout rack_branch$ i b i h


286/414










$ git checkout rack_branch$ it bt it h t


287/414












288/414












289/414












290/414












291/414










$ git checkout rack_branch$ git merge s s btree no commit sq ash master


292/414

$ git merge -s subtree --no-commit --squash master









$ git checkout rack_branch$ git merge s subtree no commit squash master


293/414

$ git merge -s subtree --no-commit --squash master







294/414


295/414

git merge -s subtree --no-commit --squash master

really?

Tim Dysinger


296/414

http://dysinger.net/2008/04/29/

replacing-braid-or-piston-for-git-with-40-lines-of-rake/

y g

Tim Dysinger


297/414

http://dysinger.net/2008/04/29/

replacing-braid-or-piston-for-git-with-40-lines-of-rake/

http://tinyurl.com/braidgit

y g


298/414

Patch Staging


299/414

git add -p

$ git status

# On branch master

# Changed but not updated:


300/414

# (use "git add ..." to update what wi# (use "git checkout -- ..." to disca

##!modified: ticgit.gemspec#

no changes added to commit (use "git add" and

$ git status

# On branch master

# Changed but not updated:


301/414

# (use "git add ..." to update what wi# (use "git checkout -- ..." to disca

##!modified: ticgit.gemspec#

no changes added to commit (use "git add" and

$ git add -p

diff --git a/ticgit.gemspec b/ticgit.gemspecindex 9c32bd4..a44667b 100644

--- a/ticgit.gemspec

+++ b/ticgit.gemspec


302/414

@@ -1,7 +1,7 @@

Gem::Specification.new do |s|

s.platform = Gem::Platform::RUBY

s.name = "ticgit"- s.version = "0.3.5"+ s.version = "0.3.6"

s.date = "2008-05-10"s.author = "Scott Chacon"

s.email = "[email protected]"Stage this hunk [y,n,a,d,/,j,J,g,e,?]? y

$ git add -p




@@ 1 7 1 7 @@


303/414

@@ -1,7 +1,7 @@






$ git add -p




@@ 1 7 1 7 @@


304/414

@@ -1,7 +1,7 @@





s.email = "[email protected]"Stage this hunk [y,n,a,d,/,j,J,g,e,?]?

$ git add -p




@@ 1 7 1 7 @@


305/414

@@ -1,7 +1,7 @@






@@ -9,9 +9,10 @@ Gem::Specification.new do |s|s.files = ["lib/ticgit/base.rb", "lib/ticgit"lib/ticgit/comment.rb", "lib/ticgit/ticket.rb", "lib/

ticgit.rb", "bin/ti", "bin/ticgitweb"]

s.bindir = 'bin's executables


306/414

- s.executables


307/414

- s.executables


308/414

- s.executables


309/414

#

#! modified: ticgit.gemspec#

# Changed but not updated:# (use "git add ..." to update what will be co

# (use "git checkout -- ..." to discard change#


$ git status

# On branch master


# (use "git reset HEAD ..." to unstage)#


310/414

#






311/414

$ git status

# On branch master


# (use "git reset HEAD ..." to unstage)#


312/414

#






313/414

partially stage files


314/414

git add -p


315/414

Debugging


316/414

Annotation


317/414

git blame


318/414

git blameie: what dumbass did this? oh, it was me...

git blame daemon.c979e32fa (Randal L. Schwartz 2005-10-25 16:29:09 -0700 1) #include "cache.h"

85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 2) #include "pkt-line.h"77cb17e9 (Michal Ostrowski 2006-01-10 21:12:17 -0500 3) #include "exec_cmd.h"

49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 4) #include "interpolate.h"f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 5)

85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 6) #include 85023577 (Junio C Hamano 2006-12-19 14:34:12 -0800 7)

695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 8) #ifndef HOST_NAME_MAX695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 9) #define HOST NAME MAX 256


319/414

695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 9) #define HOST_NAME_MAX 256

695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 10) #endif695dffe2 (Johannes Schindelin 2006-09-28 12:00:35 +0200 11)

415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 12) #ifndef NI_MAXSERV415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 13) #define NI_MAXSERV 32

415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 14) #endif415e7b87 (Patrick Welche 2007-10-18 18:17:39 +0100 15)

9048fe1c (Petr Baudis 2005-09-24 16:13:01 +0200 16) static int log_syslog;f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 17) static int verbose;

1955fabf (Mark Wooding 2006-02-03 20:27:04 +0000 18) static int reuseaddr;f8ff0c06 (Petr Baudis 2005-09-22 11:25:28 +0200 19)

960deccb (H. Peter Anvin 2005-10-19 14:27:01 -0700 20) static const char daemon_usage[] =1b1dd23f (Stephan Beyer 2008-07-13 15:36:15 +0200 21) "git daemon [--verbose] [--syslog] [

3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 22) " [--timeout=n] [--init-ti3bd62c21 (Stephen R. van den Berg 2008-08-14 20:02:20 +0200 23) " [--strict-paths] [--base

73a7a656 (Jens Axboe 2007-07-27 14:00:29 -0700 24) " [--user-path | --user-pa

49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 25) " [--interpolated-path=pat678dac6b (Tilman Sauerbeck 2006-08-22 19:37:41 +0200 26) " [--reuseaddr] [--detach]d9edcbd6 (Junio C Hamano 2006-09-07 01:40:04 -0700 27) " [--[enable|disable|allow

dd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 28) " [--inetd | [--listen=hosdd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 29) " [--user=user

dd467629 (Jon Loeliger 2006-09-26 09:47:43 -0500 30) " [directory...]";4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 31)

4ae95682 (H. Peter Anvin 2005-09-26 19:10:55 -0700 32) /* List of acceptable pathname prefi96f1e58f David Rient es 2006-08-15 10:23:48 -0700 33 static char **ok aths







320/414

695dffe2 (Johannes Schindelin 2006 09 28 12:00:35 +0200 9) #define HOST_NAME_MAX 256



















321/414














979e32fa (Randal L. Schwartz 2005-10-25 16:29:09 -0700 1) #include "cache.h"





git blame daemon.c


322/414



















git blame daemon.c


323/414
















49ba83fb (Jon Loeliger 2006-09-19 20:31:51 -0500 4) #include "interpolate.h"f8ff0c06 (Petr Baudis 2005-09-22

The GitHub Panel

Documents

Transcript of The GitHub Panel