Git Notes
Git Notes
Explore nature
in Canada.
See more
👩🏼💻
www.mywebsite.com local
👩🏼💻
www.mywebsite.com local
Explore nature
Explore nature in Canada.
Visit Canada’s lakes and mountains.
in Canada.
See more See more
👩🏼💻
www.mywebsite.com local
Explore nature
Explore nature in Canada.
Visit Canada’s lakes and mountains.
in Canada.
See more See more
👩🏼💻♀️
🤦🏼
Git
Content tracker
Git
Home Contact About
Explore nature
in Canada. New state of your website with
Visit Canada’s lakes and mountains. the local changes
See more
Explore nature
Hosted state of your website
in Canada.
See more
Fixed button CSS @max 🙋🏽♂️ 12.23AM
Explore nature
in Canada.
Visit Canada’s lakes and mountains.
See more
Change background
Explore nature
in Canada.
Added front page
See more
Home Contact Abbout
Explore nature
in Canada.
Visit Canada’s lakes and mountains.
See more
Change background
Explore nature
in Canada.
Added front page
See more
Home Contact Abbout
Explore nature
in Canada.
Visit Canada’s lakes and mountains.
See more
Change background
Explore nature
in Canada.
Added front page
See more
www.mywebsite.com
Explore nature
in Canada.
See more
Explore nature
in Canada. Explore nature
Visit Canada’s lakes and mountains.
See more
Change background Fixed button typo in Canada.
See more
Explore nature
in Canada.
Added front page
See more
www.mywebsite.com
Explore nature
in Canada.
See more
Explore nature
in Canada. Explore nature
Visit Canada’s lakes and mountains.
See more
Change background Fixed button typo in Canada.
See more
Explore nature
in Canada.
Added front page
See more
Remote Repository
Local Repository
<html>
<body>
👩🏽
<h1>My Website!</h1>
</body>
</html>
Remote Repository
<html>
<body>
<h1>My Website!</h1>
</body>
</html>
<html>
<body>
👩🏽 👱🏾♂️
<h1>My Website!</h1>
</body>
</html>
Remote Repository
<html>
<body>
<h1>My Website!</h1>
</body>
</html>
<html>
<body>
👩🏽 👱🏾♂️
<h1>My Website!</h1>
</body>
</html>
Remote Repository
<html>
<body>
<h1>My Website!</h1>
</body>
</html>
<html>
<body>
👩🏽 <html>
<body>
👱🏾♂️
<h1>My Website!</h1>
<h1>My Website!</h1>
<p>This is some more text!</p>
</body>
</body>
</html>
</html>
Remote Repository
<html>
<body>
<h1>My Website!</h1>
</body>
</html>
<html>
<body>
👩🏽 <html>
<html>
<body>
<body>
👱🏾♂️
<h1>My
<h1>MyWebsite!</h1>
Website!</h1>
<h1>My Website!</h1>
<p>This
<p>Thisisissome
somemore
moretext!</p>
text!</p>
</body>
</body>
</body>
</html>
</html>
</html>
Remote Repository
<html>
<html>
<body>
<body>
<h1>My Website!</h1>
<h1>My Website!</h1>
<p>This is some more text!</p>
</body>
</body>
</html>
</html>
<html>
<body>
👩🏽 <html>
<html>
<body>
<body>
👱🏾♂️
<h1>My
<h1>MyWebsite!</h1>
Website!</h1>
<h1>My Website!</h1>
<p>This
<p>Thisisissome
somemore
moretext!</p>
text!</p>
</body>
</body>
</body>
</html>
</html>
</html>
Local Repository
story2.txt
story1.txt
Initialize Git Repo
bash
$ git init
Initialized empty Git repository in
/Users/lydiahallie/Desktop/myproject/.git/
bash
$ ls -a
. .. .git
bash
$ touch story1.txt
$ echo "This is a beautiful story" >> story1.txt
bash
$ git status
On branch master
No commits yet
Untracked files:
story1.txt
story1.txt
bash
story1.txt
bash
story1.txt
Added first story @me 🙋🏼♀️
Git log
bash
$ git log
commit 67c833e3…ecb7df62f (HEAD -> master)
https://.../.../[name].git
bash
Local Repository
$ git remote -v
origin https://.../.../[name].git (fetch)
origin https://.../.../[name].git (push)
Pushing
Remote Repository
Local Repository
<html>
<body>
👩🏽
<h1>My Website!</h1>
</body>
</html>
bash
$ cd remote-repo
$ git log
commit 67c833e3…ecb7df62f (HEAD -> origin/master)
Added fifth story @me 🙋🏼♀️ 👨🏼💻 Fixed fourth story @friend
Added fifth story @me 🙋🏼♀️ 👨🏼💻 Fixed fourth story @friend
$ git branch
master
* sarah
Added first story @me 🙋🏼♀️ master sarah
Added second story @sarah 👩🏽💻
sarah max
sarah max
sarah max
master
sarah max
master
master sarah max
## Fourth Story
<<<<<<<< HEAD
This is Sarah’s version
=======
This is Max’s version
>>>>>>> max
of the fourth story!
## Fourth Story
<<<<<<<< HEAD
This is Sarah’s version
=======
This is Max’s version
>>>>>>> max
of the fourth story!
origin/master
sarah
master
Added second story @sarah 👩🏽💻
max
90f7d
Merge sarah into master @sarah 👩🏽💻
sarah max master
sarah
master
Added second story @sarah 👩🏽💻 890sf
max
7wtf78
Added third story @max 🧔🏻
6a6f6
6a6f6
6a6f6
sarah
sarah
sarah
sarah
First story
bash
First story
Git Object Contents
commit
tree
blob
Added third story @sarah 👩🏽💻
8ad5d
8ad5d
aaba5
fb9f1
blob
8ad5d
aaba5
fb9f1
blob
8ad5d
aaba5
fb9f1
blob
8ad5d
aaba5
fb9f1
Resetting and Reverting
bash
8ad5d
8ad5d
890hs
8ad5d
8ad5d
8ad5d
aaba5
aaba5
8ad5d
aaba5
aaba5
+ third_story.md
bash
sarah
$ git stash
Added second story @sarah 👩🏽💻
+ third_story.md
bash
sarah
$ git stash
Added second story @sarah 👩🏽💻
+ third_story.md
WIP on sarah:
f4e8304 Added second story
bash
sarah
$ git stash
Added second story @sarah 👩🏽💻
+ third_story.md
WIP on sarah:
f4e8304 Added second story
bash
sarah
$ git stash pop
Added second story @sarah 👩🏽💻
+ third_story.md
WIP on sarah:
f4e8304 Added second story
bash
sarah
$ git stash pop
Added second story @sarah 👩🏽💻
+ third_story.md
WIP on sarah:
f4e8304 Added second story
bash
sarah
$ git stash pop
Added second story @sarah 👩🏽💻
$ git stash
+ third_story.md
bash
$ git stash
+ third_story.md
bash
$ git stash
+ fourth_story.md
+ third_story.md
bash
$ git stash
+ fourth_story.md
+ third_story.md
bash
$ git stash
+ fifth_story.md
+ fourth_story.md
+ third_story.md
bash
$ git stash
+ fifth_story.md
+ fourth_story.md
+ third_story.md
bash