<commit_before>---
layout: page
title: "Git"
description: "A basic introduction to Git for the purposes of CS61B"
permalink: /cs61b/git/
category: cs61b
# tags will also be used as html meta keywords.
tags:
  - cs61b
  - git
show_meta: true
comments: true
mathjax: true
gistembed: true
published: true
noindex: false
nofollow: false
---

A disclaimer before you read this. This note is for the purpose of git as used in CS61B and how I personally use git. I will graze over some of the finer details of git at the beginning. If you understand the basic of git and want a much more detailed guide, I point you to [<NAME>'s Git Guide](http://www.cs61bl.org/su16/materials/guides/using-git.html).

Table of Contents
-----------------

- [Git Basics](#basics)
- [A Bit More Convoluted](#commit)
- [The Push and Pull](#pull)
- [Tag You're It](#tag)
- [Branching Into Advanced Stuff](#branch)
- [Merging Realities Together](#merge)
- [TLDR](tldr)

Git Basics<a name="basics"></a>
--------------

Git is a version control system. It does what that sounds like it does, it keeps different versions of your files. I personally like to think of git as a photographer.
<commit_msg>added except line to git page<commit_after>---
layout: page
title: "Git"
description: "A basic introduction to Git for the purposes of CS61B"
permalink: /cs61b/git/
category: cs61b
# tags will also be used as html meta keywords.
tags:
  - cs61b
  - git
show_meta: true
comments: true
mathjax: true
gistembed: true
published: true
noindex: false
nofollow: false
---

A disclaimer before you read this. This note is for the purpose of git as used in CS61B and how I personally use git. I will graze over some of the finer details of git at the beginning. If you understand the basic of git and want a much more detailed guide, I point you to [<NAME>'s Git Guide](http://www.cs61bl.org/su16/materials/guides/using-git.html).

<!--more-->

Table of Contents
-----------------

- [Git Basics](#basics)
- [A Bit More Convoluted](#commit)
- [The Push and Pull](#pull)
- [Tag You're It](#tag)
- [Branching Into Advanced Stuff](#branch)
- [Merging Realities Together](#merge)
- [TLDR](tldr)

Git Basics<a name="basics"></a>
--------------

Git is a version control system. It does what that sounds like it does, it keeps different versions of your files. I personally like to think of git as a photographer.

{'fraction_non_alphanumeric': 0.12199240185732377, 'fraction_numerical': 0.011819333051920641, 'mean_word_length': 3.5752895752895753, 'pattern_counts': {'":': 0, '<': 10, '<?xml version=': 0, '>': 10, 'https://': 0, 'lorem ipsum': 0, 'www.': 2, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '641805', 'n_tokens_mistral': 759, 'n_tokens_neox': 714, 'n_words': 332}