Advanced Git: Functionality and Features

1

© 2016 Brent Laster

1

© 2016 Brent Laster@BrentCLaster

Advanced Git:Functionality and Features

Open Source 101 ConferenceFebruary 4, 2017

Brent Laster (author of Professional Git)

2


2

@BrentCLaster

About me

Senior Manager, R&D at SAS in Cary, NC Global Trainer and Speaker Git, Gerrit, Gradle, Jenkins, Pipelines Author - NFJS magazine, Professional Git book LinkedIn https://www.linkedin.com/in/brentlaster Twitter @BrentCLaster

https://www.linkedin.com/in/brentlaster



3


3

@BrentCLaster

Professional Git

Available on: Amazon.com Wiley.com

4


4

@BrentCLaster

Agenda Core concepts refresh Merging and Rebasing Stash Reset and Revert Rerere Bisect Worktrees Submodules Subtrees Interactive Rebase Notes Grep

5


Check Out

CommitChekout

Checkout

Commit

Clone

Remote Repository

Local Environment

Central Server

Local Machine

Centralized Version Control Model Distributed Version Control Model

Centralized vs. Distributed VCS

6


6

@BrentCLaster

Git in One Picture

Dev

Prod

Public

Test

7


7

@BrentCLaster

Git in One Picture

Working DirectoryDev

Prod

Public

Test

8


8

@BrentCLaster

Git in One Picture

Staging Area


Prod

Public

Test

9


9

@BrentCLaster

Git in One Picture

Staging Area

Local Repository


Prod

Public

Test

10


10

@BrentCLaster

Git in One Picture

Staging Area

Local Repository


Prod

Public

Test

11


11

@BrentCLaster

Git in One Picture

Staging Area

Local Repository


Prod

Public

Test

Local Machine

12


12

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Local Machine

13


13

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Local Machine

14


14

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Server

Local Machine

15


15

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Server

Local Machine

16


16

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Server

Add

Local Machine

17


17

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Server

Add

Local Machine

18


18

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Server

Add

Commit

Local Machine

19


19

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Server

Add

Commit

Local Machine

20


20

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Checkout

Server

Add

Commit

Local Machine

21


21

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Checkout

Server

Add

Commit

Local Machine

22


22

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Checkout

Server

Add

Commit

Push

Local Machine

23


23

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Checkout

Server

Add

Commit

Push

Local Machine

24


24

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Checkout

Server

Add

Commit

Push Clone

Local Machine

25


25

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Checkout

Server

Add

Commit

Push Clone

Local Machine

26


26

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Checkout

Server

Add

Commit

Push Clone

Local Machine

Fetch

27


27

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository


Prod

Public

Test

Checkout

Server

Add

Commit

Push Clone

Local Machine

Fetch

28


28

@BrentCLaster

Git in One Picture

Staging Area

Remote Repository

Local Repository

Working Directory

Pull

Dev

Prod

Public

Test

Checkout

Server

Add

Commit

Push Clone

Local Machine

Fetch

29


29

@BrentCLaster

Git Granularity (What is a unit?)

30


30

@BrentCLaster


In traditional source control, the unit of granularity is usually a file

31


31

@BrentCLaster



file1.javafile1.java

32


32

@BrentCLaster



file1.java

CVS

file1.java

33


33

@BrentCLaster



file1.java

CVS

file1.javaDelta

34


34

@BrentCLaster



In Git, the unit of granularity is usually a tree

file1.java

CVS

file1.javaDelta

35


35

@BrentCLaster




dir: proj1

file1.java

file2.java

Working directory

file1.java

CVS

file1.javaDelta

36


36

@BrentCLaster




dir: proj1

file1.java

file2.java

Working directory

file1.java

CVS

file1.javaDelta

37


37

@BrentCLaster




dir: proj1

file1.java

file2.java

Working directory

file1.java

CVS

Git Commit

file1.javaDelta

38


38

@BrentCLaster




dir: proj1

file1.java

file2.java

Working directory

file1.java

CVS

Git Commit

file1.javaDelta

39


39

@BrentCLaster




dir: proj1

file1.java

file2.java

Working directory

file1.java

CVS

Git

file1.javaDelta

Commit

Snapshot

40


40

@BrentCLaster

Merging: What is a Fast-forward?

Assume you have three branches as below You want to merge hotfix into master (so master will

have your hotfix for future development)

C2

C3

C0 C1 C4

feature

hotfix

41


41

@BrentCLaster



have your hotfix for future development)$ git checkout master

C2

C3

C0 C1 C4

feature

hotfix

42


42

@BrentCLaster



have your hotfix for future development)$ git checkout master$ git merge hotfix

C2

C3

C0 C1 C4

feature

hotfix

43


43

@BrentCLaster



have your hotfix for future development)$ git checkout master$ git merge hotfixUpdating f42c576..3a0874cFast ForwardREADME | 1-1 files changed, 0 insertions(+) 1 deletions (-)

C2

C3

C0 C1 C4

feature

hotfix

44


44

@BrentCLaster




About “Fast Forward” – because commit pointed to by branch merged was directly “upstream” of the current commit, Git moves the pointer forward

C2

C3

C0 C1 C4

feature

hotfix

45


45

@BrentCLaster




About “Fast Forward” – because commit pointed to by branch merged was directly “upstream” of the current commit, Git moves the pointer forward

(Both branches were in the same line of development, so the net result is that master and hotfix point to the same commit)

C2

C3

C0 C1 C4

feature

hotfix

46


46

@BrentCLaster

Assume branching scenario below

Merging: What is a 3-way Merge?

C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

47


47

@BrentCLaster

Assume branching scenario below master and feature branches have both diverged (changed) since their last

common ancestor (commit/snapshot)


C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

48


48

@BrentCLaster


common ancestor (commit/snapshot) Intent is to change to master and merge in feature


C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

49


49

@BrentCLaster


common ancestor (commit/snapshot) Intent is to change to master and merge in feature Current commit on target branch isn’t a direct ancestor of current commit on

branch you’re merging in (i.e. C4 isn’t on the same line of development as C5)


C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

50


50

@BrentCLaster



branch you’re merging in (i.e. C4 isn’t on the same line of development as C5) Git does 3-way merge using common ancestor


C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

51


51

@BrentCLaster





$ git checkout master

C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

52


52

@BrentCLaster





$ git checkout master$ git merge feature

C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

53


53

@BrentCLaster






C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

54


54

@BrentCLaster






C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

55


55

@BrentCLaster






C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

56


56

@BrentCLaster



branch you’re merging in (i.e. C4 isn’t on the same line of development as C5) Git does 3-way merge using common ancestor Instead of just moving branch pointer forward, Git creates a new snapshot and

a new commit that points to it called a “merge commit”



C2

C3

C4

C5

feature

C0 C1

Common Ancestor

Branch Tip

Branch Tip

master

57


57

@BrentCLaster

Merging: What is a Rebase?

C3

C4

C5

C0

Common Ancestor

C2

feature

C1

master

58


58

@BrentCLaster

Merging: What is a Rebase? Rebase – take all of the changes that were committed on one branch and replay

them on another one.

C3

C4

C5

C0

Common Ancestor

C2

feature

C1

master

59


59

@BrentCLaster


them on another one. Concepts in simple syntax (git rebase branch2 [branch1]):

C3

C4

C5

C0

Common Ancestor

C2

feature

C1

master

60


60

@BrentCLaster



Move branchpoint of branch (carrying along all commits) to be off of a different commit (new base)

C3

C4

C5

C0

Common Ancestor

C2

feature

C1

master

61


61

@BrentCLaster



Move branchpoint of branch (carrying along all commits) to be off of a different commit (new base) Current branch (or branch1 if supplied) is one having its branchpoint moved

C3

C4

C5

C0

Common Ancestor

C2

feature

C1

master

62


62

@BrentCLaster



Move branchpoint of branch (carrying along all commits) to be off of a different commit (new base) Current branch (or branch1 if supplied) is one having its branchpoint moved Branch2 (or commit) provided as first/only argument is the new branchpoint

C3

C4

C5

C0

Common Ancestor

C2

feature

C1

master

63


63

@BrentCLaster



Move branchpoint of branch (carrying along all commits) to be off of a different commit (new base) Current branch (or branch1 if supplied) is one having its branchpoint moved Branch2 (or commit) provided as first/only argument is the new branchpoint In simple case, think of it as “pick up branch1 entirely and move its branchpoint to be after the tip of

branch2)”

C3

C4

C5

C0

Common Ancestor

C2

feature

C1

master

64


64

@BrentCLaster




branch2)”

Process:

C3

C4

C5

C0

Common Ancestor

C2

feature

C1

master

65


65

@BrentCLaster




branch2)”

Process:

$ git checkout feature$ git rebase master

C3

C4

C5

C0

Common Ancestor

C2

feature

C1

master

66


66

@BrentCLaster




branch2)”

Process: Goes to the common ancestor of the two branches (the one you are on and the one you are rebasing

onto)


C3

C4

C5

C0

Common Ancestor

C2

feature

C1 C2

master

67


67

@BrentCLaster




branch2)”


onto) Gets the diff introduced by each commit of the branch you are on, saving them to temporary files


C3

C4

C5

C0

Common Ancestor

C2

feature

C1 C2

master

68


68

@BrentCLaster




branch2)”


onto) Gets the diff introduced by each commit of the branch you are on, saving them to temporary files Applies each change in turn


C3

C4

C5

C0

Common Ancestor

C2

feature

C1 C3’ C5’C2

master

69


69

@BrentCLaster




branch2)”


onto) Gets the diff introduced by each commit of the branch you are on, saving them to temporary files Applies each change in turn Moves the branch to the new rebase point


C3

C4

C5

C0

Common Ancestor

C2

feature

C1 C3’ C5’C2

master

70


70

@BrentCLaster




branch2)”


onto) Gets the diff introduced by each commit of the branch you are on, saving them to temporary files Applies each change in turn Moves the branch to the new rebase point


C3

C4

C5

C0

Common Ancestor

C2

feature

C1 C3’ C5’C2

master

71


71

@BrentCLaster

Command: Git Stash Purpose -- allow you to keep a backup copy of your work

that hasn’t been committed yet Use case - you want to switch branches but don’t want

to lose work that hasn’t been committed; you want to save something you’ve tried and may want to come back to

Syntax:

72


72

@BrentCLaster

Stash

73


73

@BrentCLaster

Stash

Staging AreaStaging Area

Local Repository

Working Directory

74


74

@BrentCLaster

Stash


Local Repository

Working Directory*

75


75

@BrentCLaster

Stash


Local Repository

Working Directory*

*

76


76

@BrentCLaster

Stash


Local Repository

Working Directory*

*

> git stash

77


77

@BrentCLaster

Stash


Local Repository

Working Directory*

*

> git stash

78


78

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *

stash@{0}

> git stash

79


79

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *

**

stash@{0}

> git stash

80


80

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *

**

**

stash@{0}

> git stash

81


81

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *

**

**

stash@{0}

> git stash

#

82


82

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *

**

**

stash@{0}

> git stash > git stash -u

#

83


83

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *

stash@{1}Staging Area **

Working Directory

**#

stash@{0}

stash@{0}

stash@{1}

> git stash -u

84


84

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *


Working Directory

**#

***

stash@{0}

stash@{0}

stash@{1}

> git stash -u

85


85

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *


Working Directory

**#

***

***

stash@{0}

stash@{0}

stash@{1}

> git stash -u

86


86

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *


Working Directory

**#

***

***

stash@{0}

stash@{0}

stash@{1}

> git stash save “cool feature”

87


87

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *


Working Directory

**#

stash@{0}Staging Area ***

stash@{2}

stash@{1}

stash@{0}

stash@{0}stash@{1}

stash@{1}stash@{2}

“cool feature”

Working Directory

***

88


88

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *


Working Directory

**#


stash@{2}

stash@{1}

stash@{0}

stash@{0}stash@{1}

stash@{1}stash@{2}

“cool feature”

Working Directory

***

> git stash apply stash@{1}

89


89

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *


Working Directory

**#


stash@{2}

**

**

stash@{1}

stash@{0}

stash@{0}stash@{1}

stash@{1}stash@{2}

“cool feature”

Working Directory

*** #

> git stash apply stash@{1}

90


90

@BrentCLaster

Stash


Local Repository

Working Directory

stash@{0}

Staging Area *

Working Directory *


Working Directory

**#


stash@{2}

**

**

stash@{1}

stash@{0}

stash@{0}stash@{1}

stash@{1}stash@{2}

“cool feature”

Working Directory

*** #

$ git stash pop stash@{2}

91


91

@BrentCLaster

Stash


Local Repository

Working Directory

Staging Area *

Working Directory *


Working Directory

**#


***

***

stash@{0}stash@{1}

“cool feature”

Working Directory

*** #

$ git stash pop stash@{2}

92


92

@BrentCLaster

Command: Git Reset Purpose -- allow you to “roll back” so that your branch

points at a previous commit ; optionally also update staging area and working directory to that commit

Use case - you want to update your local environment back to a previous point in time; you want to overwrite or a local change you’ve made

Syntax:

Warning: --hard overwrites everything

93


93

@BrentCLaster

Command: Git Revert Purpose -- allow you to “undo” by adding a new change

that cancels out effects of previous one Use case - you want to cancel out a previous change but

not roll things back Syntax:

Note: The net result of using this command vs. reset can be the same. If so, and content that is being reset/revert has been pushed such that others may be consuming it, preference is for revert.

94


94

@BrentCLaster

Local Repository

Reset and Revert

Line 1

Staging Area

Working Directory

XYZ

ABC

Line 1

87ba8bc 43bd3ef d21be2c

Line 1Line 2Line 3

Line 1Line 2Line 1Line 1 Line 1Line 2

tag: current

95


95

@BrentCLaster

Local Repository

git reset --hard 87ba8bc

Reset and Revert

Line 1

Staging Area

Working Directory

XYZ

ABC

Line 1


Line 1Line 2Line 3

Line 1Line 2

Line 1

Line 1 Line 1Line 2

tag: current

96


96

@BrentCLaster

Local Repository

git reset --hard 87ba8bc

Reset and Revert

Line 1

Staging Area

Working Directory

XYZ

ABC

Line 1


Line 1Line 2Line 3

Line 1Line 2

Line 1

Line 1 Line 1Line 2

tag: current

97


97

@BrentCLaster

Local Repository

git reset current~1 [--mixed]

Reset and Revert

Line 1

Staging Area

Working Directory

XYZ

ABC

Line 1


Line 1Line 2Line 3

Line 1Line 2

Line 1

Line 1 Line 1Line 2

tag: current

98


98

@BrentCLaster

Local Repository

git reset current~1 [--mixed]

Reset and Revert

Line 1

Staging Area

Working Directory


Line 1Line 2Line 3

Line 1 Line 1Line 2

tag: current

99


99

@BrentCLaster

Local Repository

git revert HEAD~1

Reset and Revert

Line 1

Staging Area

Working Directory


Line 1Line 2Line 3

Line 1Line 2

Line 1 Line 1Line 2

tag: current

100


100

@BrentCLaster

Local Repository

git revert HEAD~1

Reset and Revert

Line 1

Staging Area

Working Directory


Line 1Line 2Line 3

c1c8bd4

Line 1Line 2

Line 1 Line 1Line 2

tag: current

101


101

@BrentCLaster

Local Repository

Reset and Revert

Line 1

Staging Area

Working Directory


Line 1Line 2Line 3

c1c8bd4

Line 1Line 2

Line 1 Line 1Line 2

tag: current

102


102

@BrentCLaster

Command: Git Rerere (Reuse Recorded Resolution) Purpose -- allows recording of how you solve a merge

situation and then can automatically resolve the same situation in the same way if needed later

Use case - trial and repeated merges; merging newer versions of a branch with the same conflicts into a newer one periodically; resolve conflicts after reset or revert; applicable to any repeated merge case: rebase, merge

Syntax: Note: This is a “state” command. Enabled by turning on

a state in Git, rather than just running a command Enabled via git config --global rerere.enabled 1

» Then runs automatically Invoked directly via git rerere for related commands or options

103


103


Local Repository

feature

Staging Area

File B

Working Directory

File C

File A

File B

master

File A

File C

File B

File A

File C

File BFile B

File A File C

Git Rerere 1

104


104


Local Repository

feature

Staging Area

File B

Working Directory

$ git checkout master

File C

File A

File B

master

File A

File C

File B

File A

File C

File BFile B

File A File C

Git Rerere 1

105


105


Local Repository

feature

Staging Area

File B

Working Directory

$ git checkout master$ git config --global rerere.enabled 1

File C

File A

File B

master

File A

File C

File B

File A

File C

File BFile B

File A File C

rr-cacheGit Rerere 1

106


106


Local Repository

feature

Staging Area

File B

Working Directory

$ git checkout master$ git config --global rerere.enabled 1$ git merge feature

File C

File A

File B

master

File A

File C

File B

File A

File C

X

File A File C


107


107


Local Repository

feature

Staging Area

File B

Working Directory


File C

File A

File B

master

File A

File C

File B

File A

File C

File B<<>>

File A File CFile A File C


108


108


Local Repository

feature

Staging Area

File B

Working Directory


File C

File A

File B

master

File A

File C

File B

File A

File C

File B<<>>


rr-cache

File A File C

Git Rerere 1

109


109


Local Repository

feature

Staging Area

File B

Working Directory


File C

File A

File B

master

File A

File C

File B

File A

File C

File B<<>>


rr-cache

File A File C

File B<<>>

preimageGit Rerere 1

110


110


Local Repository

feature

Staging Area

File B

Working Directory

$ git checkout master$ git config --global rerere.enabled 1$ git merge feature Recorded preimage for ‘File B’

File C

File A

File B

master

File A

File C

File B

File A

File C

File B<<>>


rr-cache

File A File C

File B<<>>


111


111


Local Repository

feature

Staging Area

File B

Working Directory

$ git checkout master$ git config --global rerere.enabled 1$ git merge feature Recorded preimage for ‘File B’$ git status

Changes to be committed:modified: File Amodified: File C

Unmerged pathsboth modified: File B

File C

File A

File B

master

File A

File C

File B

File A

File C

File B<<>>


rr-cache

File A File C

File B<<>>


112


112


Local Repository

feature

Staging Area

File B

Working Directory




[fix conflicts]

File C

File A

File B

master

File A

File C

File B

File A

File C

File B<<>>File B


rr-cache

File A File C

File B<<>>


113


113


Local Repository

feature

Staging Area

File B

Working Directory




[fix conflicts]$ git add .

File C

File A

File B

master

File A

File C

File B

File A

File C

File B

File A File CFile BFile A File C

rr-cache

File A File C

File B<<>>


114


114


Local Repository

feature

Staging Area

File B

Working Directory




[fix conflicts]$ git add . $ git commit –m “finalize merge”

File C

File A

File B

master

File A

File C

File B

File A

File C

File A File C

File B

File A File C

rr-cache

File A File C

File B<<>>


115


115


Local Repository

feature

Staging Area

File B

Working Directory





File C

File A

File B

master

File A

File C

File B

File A

File C

File A File C

File B

File A File C

rr-cache

File A File C

File B<<>>

preimage postimageGit Rerere 1

116


116


Local Repository

feature

Staging Area

File B

Working Directory





File C

File A

File B

master

File A

File C

File B

File A

File C

File A File C

File B

File A File C

rr-cache

File A File C

File B<<>>

preimage postimage

File BGit Rerere 1

117


117


Local Repository

feature

Staging Area

File B

Working Directory




[fix conflicts]$ git add . $ git commit –m “finalize merge” Recorded resolution for ‘File B’

File C

File A

File B

master

File A

File C

File B

File A

File C

File A File C

File B

File A File C

rr-cache

File A File C

File B<<>>

preimage postimage

File BGit Rerere 1

118


118


Local Repository

feature

Staging Area

File B

Working Directory




[fix conflicts]$ git add . $ git commit –m “finalize merge” Recorded resolution for ‘File B’

File C

File A

File B

master

File A

File C

File B

File A

File C

File A File C

File B

File A File C

rr-cache

File A File C

File B<<>>

preimage postimage

File BGit Rerere 1

119


119


Local Repository

feature

Staging Area

File B

Working Directory

$ git reset --hard HEAD~1

File C

File A

File B

master

File A

File C

File B

File A

File C

File BFile B

File A File C

rr-cacheFile B<<>>

preimage postimage

File BGit Rerere 2

120


120


Local Repository

feature

Staging Area

File B

Working Directory

$ git reset --hard HEAD~1$ git checkout master

File C

File A

File B

master

File A

File C

File B

File A

File C

File BFile B

File A File C

rr-cacheFile B<<>>

preimage postimage

File BGit Rerere 2

121


121


Local Repository

feature

Staging Area

File B

Working Directory

$ git reset --hard HEAD~1$ git checkout master$ git merge feature Merge conflict in ‘File B’

File C

File A

File B

master

File A

File C

File B

File A

File C

File B<<>>


rr-cache

File A File C

File B<<>>

preimage postimage

File BGit Rerere 2

122


122


Local Repository

feature

Staging Area

File B

Working Directory

$ git reset --hard HEAD~1$ git checkout master$ git merge feature Merge conflict in ‘File B’ Resolved ‘File B’ using previous resolution

File C

File A

File B

master

File A

File C

File B

File A

File C

File A File C

File B

File A File C

rr-cache

File A File C

File B<<>>

preimage postimage

File BGit Rerere 2

123


123

@BrentCLaster

Command: Bisect Purpose - Use “automated” binary search through Git’s history to find a

specific commit that first introduced a problem (i.e. “first bad commit”) Use case - Quickly locate the commit in Git’s history that introduced a

bug Syntax:

124


124

@BrentCLaster

LOCAL REPOSITORY

Version 1Version 1

Bisect

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

125


125

@BrentCLaster

LOCAL REPOSITORY

Version 1Version 1

Bisect

checkout latest version

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

126


126

@BrentCLaster

LOCAL REPOSITORY

Version 1Version 1

Bisect

checkout latest version

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

127


127

@BrentCLaster

LOCAL REPOSITORY

Version 1Version 1

Bisect

checkout latest version try code

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

128


128

@BrentCLaster

LOCAL REPOSITORY

Version 1Version 1

Bisect


Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

129


129

@BrentCLaster

LOCAL REPOSITORY

Version 1Version 1

Bisect


Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

130


130

@BrentCLaster

LOCAL REPOSITORY

Version 1Version 1

Bisect

checkout latest version try code git bisect start

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

131


131

@BrentCLaster

LOCAL REPOSITORY

Version 1Version 1

Bisect

checkout latest version try code git bisect start git bisect bad

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

132


132

@BrentCLaster

LOCAL REPOSITORY

Version 1Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out)

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

133


133

@BrentCLaster

LOCAL REPOSITORY

Version 1

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out)

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

134


134

@BrentCLaster

LOCAL REPOSITORY

Version 1

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

135


135

@BrentCLaster

LOCAL REPOSITORY

Version 1

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

136


136

@BrentCLaster

LOCAL REPOSITORY

Version 1

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code git bisect good (bisect checks out version 5)

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

137


137

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code git bisect good (bisect checks out version 5)

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

138


138

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code git bisect good (bisect checks out version 5) try code

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

139


139

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect


Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

140


140

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect


Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 5

Version 2

Version 7

Version 6

WORKING DIRECTORY

141


141

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code git bisect good (bisect checks out version 5) try code git bisect good (bisect checks out version 7)

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 7

Version 6

WORKING DIRECTORY

142


142

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code git bisect good (bisect checks out version 5) try code git bisect good (bisect checks out version 7) try code

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 7

Version 6

WORKING DIRECTORY

143


143

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect


Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 7

Version 6

WORKING DIRECTORY

144


144

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect


Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 7

Version 6

WORKING DIRECTORY

145


145

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code git bisect good (bisect checks out version 5) try code git bisect good (bisect checks out version 7) try code git bisect bad (bisect checks out version 6)

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 6

WORKING DIRECTORY

146


146

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code git bisect good (bisect checks out version 5) try code git bisect good (bisect checks out version 7) try code git bisect bad (bisect checks out version 6) try code

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 6

WORKING DIRECTORY

147


147

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect


Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 6

WORKING DIRECTORY

148


148

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect


Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 6

WORKING DIRECTORY

149


149

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code git bisect good (bisect checks out version 5) try code git bisect good (bisect checks out version 7) try code git bisect bad (bisect checks out version 6) try code git bisect bad (git reports version 6 as the first

bad commit)

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 6

WORKING DIRECTORY

150


150

@BrentCLaster

LOCAL REPOSITORY

Version 1

Bisect

checkout latest version try code git bisect start git bisect bad checkout earlier version ( user checks out) try code git bisect good (bisect checks out version 5) try code git bisect good (bisect checks out version 7) try code git bisect bad (bisect checks out version 6) try code git bisect bad (git reports version 6 as the first

bad commit)

Version 3

Version 4

Version 5

Version 6

Version 7

Version 8

Version 9

Version 10

Version 2

Version 6

FIRST BAD COMMIT

WORKING DIRECTORY

151


151

@BrentCLaster

Background: Switching between Branches

Local Repository

Working Directory

87ba8bc

43bd3ef d21be2c c1c8bd4

152


152

@BrentCLaster

Background: Switching between BranchesCommand: git checkout <branch>

Local Repository

Working Directory

87ba8bc


153


153

@BrentCLaster

Background: Switching between BranchesCommand: git checkout <branch>git checkout master

Local Repository

Working Directory

87ba8bc


154


154

@BrentCLaster


Does three things

Local Repository

Working Directory

87ba8bc


155


155

@BrentCLaster


Does three things Moves HEAD pointer back to <branch>

Local Repository

Working Directory

87ba8bc


156


156

@BrentCLaster


Does three things Moves HEAD pointer back to <branch> Reverts files in working directory to

snapshot pointed to by <branch>

Local Repository

Working Directory

87ba8bc


157


157

@BrentCLaster



snapshot pointed to by <branch> Updates indicators

Local Repository

Working Directory

87ba8bc


158


158

@BrentCLaster




git branch

Local Repository

Working Directory

*

87ba8bc


mastertesting

159


159

@BrentCLaster




git checkout testing

git branch

Local Repository

Working Directory

*

87ba8bc


mastertesting

160


160

@BrentCLaster




git checkout testinggit checkout master

git branch

Local Repository

Working Directory

*

87ba8bc


mastertesting

161


161

@BrentCLaster




git checkout testinggit checkout mastergit checkout testing

git branch

Local Repository

Working Directory

*

87ba8bc


mastertesting

162


162

@BrentCLaster

Command: Worktrees Purpose - Allows multiple, separate Working Areas attached

to one Local Repository Use case - Simultaneous development in multiple branche Syntax

git worktree add [-f] [--detach] [-b <new-branch>] <path> [<branch>] git worktree list [--porcelain] git worktree prune [-n] [-v] [--expire <expire>]

Notes “Traditional” working directory is called the main working tree; Any

new trees you create with this command are called linked working trees

Information about working trees is stored in the .git area (assuming .git default GIT_DIR is used)

Working tree information is stored in .git/worktrees/<name of worktree>.

163


163

@BrentCLaster

Worktrees

Remote Repository

Main Working Tree

Server

Add

Commit

Push Pull

Staging Area

Local Repository

Working Directory (master)

Local Machine

164


164

@BrentCLaster

Worktrees git worktree add -b exp tree1

Remote Repository

Main Working Tree

Server

Add

Commit

Push Pull

Staging Area

Local Repository


Local Machine

165


165

@BrentCLaster


Remote Repository

Main Working Tree

Server

Add

Commit

Push Pull

Staging Area

Local Repository


Local Machine

worktrees/ tree1

166


166

@BrentCLaster


Remote Repository

Main Working Tree

Server

Add

Commit

Push Pull

Staging Area

Local Repository


Local Machine

worktrees/ tree1

167


167

@BrentCLaster


Remote Repository

Main Working Tree

Server

Add

Commit

Push Pull

Staging Area

Local Repository


Local Machine

worktrees/ tree1

gitdirHEAD

etc.

168


168

@BrentCLaster


Remote Repository

Main Working Tree

Server

Add

Commit

Push Pull

Staging Area

Local Repository


Local Machine

worktrees/ tree1

gitdirHEAD

etc.

tree1

Linked Working Tree

Staging Area

Working Directory (exp)

169


169

@BrentCLaster

Worktrees git worktree add -b exp tree1 git worktree add -b prod tree2

Remote Repository

Main Working Tree

Server

Add

Commit

Push Pull

Staging Area

Local Repository


Local Machine

worktrees/ tree1

gitdirHEAD

etc.

tree1

Linked Working Tree

Staging Area

Working Directory (exp)

gitdirHEAD

etc.

tree2

Linked Working Tree

Staging Area

Working Directory (prod)

tree2

170


170

@BrentCLaster

Command: Submodules Purpose - Allows including a separate repository with your current repository Use case - include the Git repository for one or more dependencies along with the

original repository for a project Syntax

git submodule [--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]

git submodule [--quiet] status [--cached] [--recursive] [--] [<path>… ]git submodule [--quiet] init [--] [<path>… ]git submodule [--quiet] deinit [-f|--force] [--] <path>… git submodule [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--rebase|--merge] [--reference <repository>]

[--depth <depth>] [--recursive] [--] [<path>… ]git submodule [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]

[commit] [--] [<path>… ]git submodule [--quiet] foreach [--recursive] <command>git submodule [--quiet] sync [--recursive] [--] [<path>… ]

Notes Creates a subdirectory off of your original repository that contains a clone of another Git

repository Original repository is typically called superproject Metadata stored in .gitmodules file

171


171

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Submodules 1

172


172

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

What happens when you add a submodule?

Submodules 1

173


173

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

What happens when you add a submodule?

Submodules 1

174


174

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

What happens when you add a submodule? 1. Git clones down the repository for the submodule into the current directory.

Submodules 1

175


175

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository


Submodules 1

176


176

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository


2. By default, Git checks out the master branch.

Submodules 1

177


177

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository


2. By default, Git checks out the master branch.

Submodules 1

178


178

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository


2. By default, Git checks out the master branch.3. Git adds the submodule’s path for cloning to the .gitmodules file.

Submodules 1

179


179

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository



.gitmodules

Submodules 1

180


180

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository



.gitmodules

Submodules 1

181


181

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository



4. Git adds the .gitmodules file to the index, ready to be committed.

.gitmodules

Submodules 1

182


182

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository




.gitmodules

Submodules 1

183


183

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository




5. Git adds the current commit ID of the submodule to the index, ready to be committed.

.gitmodules

Submodules 1

184


184

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository





.gitmodulesmod1

<current commit>

Submodules 1

185


185

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository





.gitmodulesmod1

<current commit>

Submodules 1

186


186

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository





6. To complete the add process, you need to complete the Git workflow for the staged changes. From the superproject’s directory:

.gitmodulesmod1

<current commit>

Submodules 1

187


187

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository






7. Commit

modules/mod1

gitdirHEAD

etc.

Submodules 1

188


188

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository






7. Commit

modules/mod1

gitdirHEAD

etc.

submodulereference

Submodules 1

189


189

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository






7. Commit

modules/mod1

gitdirHEAD

etc.

submodulereference

commit pointed to by submodulereference

Submodules 1

190


190

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository






7. Commit

modules/mod1

gitdirHEAD

etc.

submodulereference


Head of branch

Submodules 1

191


191

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository






7. Commit

modules/mod1

gitdirHEAD

etc.

submodulereference


Head of branch

8. Push

Submodules 1

192


192

@BrentCLaster

Remote Repository

proj_dir

superproject

Staging Area

Local Repository

Working Directory

Remote Repository

proj_dir/mod1

submodule 1

Staging Area

Working Directory

Local Repository






7. Commit

modules/mod1

gitdirHEAD

etc.

submodulereference


Head of branch

8. Push

Submodules 1

193


193

@BrentCLaster

Remote Repository

How do we clone a repository with submodules?

Submodules 2

194


194

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

modules/mod1

gitdirHEAD

etc.

How do we clone a repository with submodules?1. git clone - puts in structure - but submodules areas are empty

Submodules 2

195


195

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

modules/mod1

gitdirHEAD

etc.


2. git submodule init - puts submodule location information in superproject’s config file

Remote Repository

Submodules 2

196


196

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

modules/mod1

gitdirHEAD

etc.



Remote Repository

Submodules 2

197


197

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

modules/mod1

gitdirHEAD

etc.



Remote Repository

3. git submodule update - actually clones repositories for submodules into the corresponding subdirectories and checks out the indicated commits for the containing project

Submodules 2

198


198

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.



Remote Repository


Submodules 2

199


199

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch



Remote Repository


submodulereference

Submodules 2

200


200

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch



Remote Repository


Note: Shortcuts - git submodule update --init and git clone --recursive or --recurse-submodules

submodulereference

Submodules 2

201


201

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference

Incorporating updates to submodules:

Submodules 3

202


202

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference

new commitIncorporating updates to submodules:

Submodules 3

203


203

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference

new commitIncorporating updates to submodules:1. You can

Submodules 3

204


204

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference

new commitIncorporating updates to submodules:1. You can $ cd mod1; git checkout <branch> ; git pull

Submodules 3

205


205

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference


Submodules 3

206


206

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference


Submodules 3

207


207

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference


Submodules 3

208


208

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference


OR $ git pull --recurse-submodules; cd <module dir>; git merge origin/master

Submodules 3

209


209

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference


OR $ git pull --recurse-submodules; cd <module dir>; git merge origin/masterOR

Submodules 3

210


210

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference


OR $ git pull --recurse-submodules; cd <module dir>; git merge origin/masterOR $ git submodule update --remote

Submodules 3

211


211

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference



2. Although module has been updated, references that the superproject has to it haven’t been updated

Submodules 3

212


212

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference




Submodules 3

213


213

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference




Submodules 3

3. To update: add, commit, and push reference changes.

214


214

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference




Submodules 3


215


215

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference




Submodules 3


216


216

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc. commit pointed to by submodulereference

Head of branch

Remote Repository

submodulereference




.gitmodulesmod1

<current commit>

Submodules 3


217


217

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc. commit pointed to by submodulereference

Head of branch

Remote Repository

submodulereference




Submodules 3


218


218

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference




Submodules 3


219


219

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference




Submodules 3


220


220

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference




Submodules 3


221


221

@BrentCLaster

Remote Repository

main

superproject

Staging Area

Local Repository

Working Directory

main/mod1

submodule 1

Staging Area

Working Directory

Local Repository

modules/mod1

gitdirHEAD

etc.


Head of branch

Remote Repository

submodulereference




Submodules 3


222


222

@BrentCLaster

Submodule - Challenges Challenges around using submodules nearly always

involve keeping submodule content (and “current” commit) in sync with submodule references in superproject

If references are wrong, operations like “git submodule update” will backlevel submodule content to commits in reference

If these references are out of sync and that inconsistency is pushed to the remote for the superproject, then other users that pull that version of the superproject can end up back-leveling their submodules, even if they’ve updated their superproject before.

223


223

@BrentCLaster

Command: Subtrees

Purpose - Allows including a copy of a separate repository with your current repository

Use case - include a copy of a Git repository for one or more dependencies along with the original repository for a project

Syntax

Notes No links like a submodule - just a copy in a subdirectory Advantage - no links to maintain Disadvantage - extra content to carry around with your project

git subtree add -P <prefix> <commit> git subtree add -P <prefix> <repository> <ref> git subtree pull -P <prefix> <repository> <ref> git subtree push -P <prefix> <repository> <ref> git subtree merge -P <prefix> <commit> git subtree split -P <prefix> [OPTIONS] [<commit>]

224


224

Subtrees

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory

Remote Repository(subproj)

225


225

Subtrees Adding a copy from a remote as

a subtree

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory


226


226


a subtree cd myproject

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory


227


227


a subtree cd myproject git subtree add --prefix

subproject --squash subproj.git master

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory


228


228




Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory


myproject/subproject

subtree

Staging Area

Working Directory

Local Repository

229


229




Use “prefix” option to specify path for subproject

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory



subtree

Staging Area

Working Directory

Local Repository

230


230





Use “squash” option to compress history from remote before adding it

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory



subtree

Staging Area

Working Directory

Local Repository

231


231






branch (master) is optional

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory



subtree

Staging Area

Working Directory

Local Repository

232


232







directory listing of myproject now shows subproj as subdirectory

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory



subtree

Staging Area

Working Directory

Local Repository

233


233








Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory



subtree

Staging Area

Working Directory

Local Repository

234


234








Looking in the logs of the subproject will show the squashed history

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory



subtree

Staging Area

Working Directory

Local Repository

235


235









Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory



subtree

Staging Area

Working Directory

Local Repository

236


236









To get the latest, use pull

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory



subtree

Staging Area

Working Directory

Local Repository

237


237









To get the latest, use pull git subtree pull --prefix subproject

--squash subproj.git master

Remote Repository

myproject

superproject

superproject

Staging Area

(myproject)

Local Repository

Working Directory



subtree

Staging Area

Working Directory

Local Repository

238


238

@BrentCLaster

Subtrees - split split subcommand can be used to extract a subproject’s

content into a separate branch extracts the content and history related to <prefix> and

puts the resulting content at the root of the new branch instead of in a subdirectory

As output, Git prints out the SHA1 value for the HEAD of

the newly created tree Provides a reference to work with for that HEAD if needed New branch shows only the set of content from the subproject

that was split out (as opposed to content from the superproject).

239


239

@BrentCLaster

Subtree - create new project from split content Since can split out content from a subtree, may want to

transfer that split content into another project Very simple with Git

create new, empty project

pull contents of new branch into the new project (repository)

240


240

@BrentCLaster

Subtree - push

subtree command also supports a push subcommand This command does a split followed by an attempt to

push the split content over to the remote Example: the following command splits out the

subproject directory and then pushes it to the sub_origin remote reference and into a new branch named new branch:

241


241

@BrentCLaster

Command: (Interactive) Rebase Purpose - allows you to modify commits in the git history Use case - you need to make some kind of modification

to one or more commits in the repository (rewrite history)

Syntax

Notes - creates an interactive script/batch file to modify commits

Cautions - don’t use this on anything already pushed

242


242

@BrentCLaster

Interactive Rebase

243


243

@BrentCLaster

Interactive Rebase

244


244

@BrentCLaster

Interactive Rebase Choose set of

commits

245


245

@BrentCLaster


commits

246


246

@BrentCLaster


commits Initiate

interactive rebase

247


247

@BrentCLaster


commits Initiate

interactive rebase

248


248

@BrentCLaster


commits Initiate

interactive rebase

Git presents initial script

249


249

@BrentCLaster


commits Initiate

interactive rebase


250


250

@BrentCLaster


commits Initiate

interactive rebase


Modify commands (save and exit)

251


251

@BrentCLaster


commits Initiate

interactive rebase



252


252

@BrentCLaster


commits Initiate

interactive rebase



Act on prompts

253


253

@BrentCLaster


commits Initiate

interactive rebase



Act on prompts

254


254

@BrentCLaster


commits Initiate

interactive rebase



Act on prompts

255


255

@BrentCLaster


commits Initiate

interactive rebase



Act on prompts

256


256

@BrentCLaster


commits Initiate

interactive rebase



Act on prompts

257


257

@BrentCLaster


commits Initiate

interactive rebase



Act on prompts Commits are

updated

258


258

@BrentCLaster


commits Initiate

interactive rebase



Act on prompts Commits are

updated

259


259

@BrentCLaster

Command: Notes Purpose - Add additional information to objects in the Git repository

or look at such information Use case - At some point after making a commit, you may decide

that there are additional comments or other non-code information that you’d like to add with the commit - without changing the commit itself.

Syntaxgit notes [list [<object>]]git notes add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]git notes copy [-f] ( --stdin | <from-object> <to-object> )git notes append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]git notes edit [--allow-empty] [<object>]git notes show [<object>]git notes merge [-v | -q] [-s <strategy> ] <notes-ref>git notes merge --commit [-v | -q]git notes merge --abort [-v | -q]git notes remove [--ignore-missing] [--stdin] [<object>… ]git notes prune [-n | -v]git notes get-ref

260


260

@BrentCLaster

Notes Create a note Create a note in a custom

namespace (add --ref)

View a note (for a specific revision)

List notes in log

262


262

@BrentCLaster

grep Default behavior - search for all instances of an expression across all tracked files in

working directory Search for all instances off expression “database” across all java files (note use of -- )

-p option tells Git to try and show header of method or function where search target was found

--break - make output easier to read --heading - prints filename above output

boolean operators search in staging area search in specific commit(s)

263


263


That’s all - thanks!

Advanced Git: Functionality and Features

Technology

Transcript of Advanced Git: Functionality and Features