Skip to content

Commit e4d696a

Browse files
committed
Adding in some git branch pictures
1 parent bae71c9 commit e4d696a

File tree

3 files changed

+2
-30
lines changed

3 files changed

+2
-30
lines changed

docs/branches.md

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@ Minor modifications done for the fall 2021/2022/2023 versions of the course. -->
3333

3434
## What is a Git branch?
3535

36-
<style type="text/css">
37-
.reveal p {
38-
text-align: left;
39-
}
40-
.reveal ul {
41-
display: block;
42-
}
43-
.reveal ol {
44-
display: block;
45-
}
46-
</style>
47-
4836
* A pointer to a commit (ref: named pointer)
4937
* Defined as all points reachable in the commit graph from the named commit (the "tip" of the branch)
5038
* The ref HEAD determines what branch you are on.
@@ -53,12 +41,8 @@ Minor modifications done for the fall 2021/2022/2023 versions of the course. -->
5341

5442
---
5543

56-
<!-- .slide: data-background="#ffffff" -->
57-
5844
## Why use branches?
5945

60-
<!-- .slide: style="font-size: 32px;" -->
61-
6246
There are many uses for branches:
6347

6448
- Test different directions for a project
@@ -67,38 +51,26 @@ There are many uses for branches:
6751

6852
---
6953

70-
<!-- .slide: data-background="#ffffff" -->
71-
7254
## What is a Git branch?
7355

74-
<!-- .slide: style="font-size: 30px;" -->
75-
7656
Until now, we have worked with a repository that only have one branch, with the commits done one at a time:
7757

78-
![](https://i.imgur.com/OjpgqBz.png)
58+
![Git branch](../images/git-branch.png)
7959

8060
In the above picture, the master branch points to a commit. The current position is HEAD. (Time goes rightwards)
8161

8262
---
8363

84-
<!-- .slide: data-background="#ffffff" -->
85-
8664
### What is a Git branch - basic concepts
8765

88-
<!-- .slide: style="font-size: 30px;" -->
89-
9066
Now we want to look at repositories with several branches:
9167

92-
![](https://i.imgur.com/9lvwmg9.png)
68+
![Git several branches](../images/git-several-branches.png)
9369

9470
Branches are used to create another line of development. They are "individual projects" within a git repository.
9571

9672
---
9773

98-
<!-- .slide: data-background="#ffffff" -->
99-
100-
<!-- .slide: style="font-size: 32px;" -->
101-
10274
* The branch is the commit and all its parent commits, not just the one we are currently pointing at.
10375
* The main line of development is usually called the "master" branch.
10476
* Different branches within a repository can have

docs/images/git-branch.png

7.46 KB
Loading
10.1 KB
Loading

0 commit comments

Comments
 (0)