Skip to content

Commit

Permalink
remove include-slides
Browse files Browse the repository at this point in the history
  • Loading branch information
hectorsector committed Sep 28, 2016
1 parent b802b30 commit 238aa91
Showing 1 changed file with 14 additions and 15 deletions.
29 changes: 14 additions & 15 deletions advanced/index-extras.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ This curriculum will be your companion to the GitHub Advanced class taught by th
{% capture slide %}
### Branching strategies
{% endcapture %}
{% include slide-section %}

#### Summary
* GitHub Flow
Expand Down Expand Up @@ -43,7 +42,7 @@ These are called Branching Strategies, but are just as easily called *Team Colla
{% capture slide %}
### Applying branching patterns
{% endcapture %}
{% include slide-section %}


#### Summary
* Breaking features down into pieces
Expand All @@ -63,7 +62,7 @@ These are called Branching Strategies, but are just as easily called *Team Colla
{% capture slide %}
### Git-core GUIs
{% endcapture %}
{% include slide-section %}



#### Summary
Expand All @@ -78,15 +77,15 @@ These are called Branching Strategies, but are just as easily called *Team Colla
{% capture slide %}

{% endcapture %}
{% include slide-section %}





{% capture slide %}
### Branch best practices
{% endcapture %}
{% include slide-section %}


* Pros/cons of collapsing commits during merge
* Relation to branching strategies and deliverable expectations
Expand Down Expand Up @@ -120,7 +119,7 @@ $ git branch --no-merged [commit]
{% capture slide %}
### Navigating History
{% endcapture %}
{% include slide-section %}


#### Further reading
* [Git revision specificat
Expand All @@ -131,7 +130,7 @@ ion syntax](https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html)
{% capture slide %}
### Incorporating History
{% endcapture %}
{% include slide-section %}


#### More examples
```shell
Expand All @@ -151,7 +150,7 @@ $ git cherry [upstreambranch]
{% capture slide %}
### Rewriting history with rebase
{% endcapture %}
{% include slide-section %}




Expand All @@ -175,15 +174,15 @@ $ git rebase --onto <newbase> <upstream> <HEAD|branch>
{% capture slide %}
### Cutting Releases
{% endcapture %}
{% include slide-section %}





{% capture slide %}
### Reviewing & synchronizing
{% endcapture %}
{% include slide-section %}




Expand Down Expand Up @@ -218,7 +217,7 @@ $ git config --add remote.[upstream].fetch "+refs/pull/*/head:refs/remotes/[upst
{% capture slide %}
### Aggregating repositories
{% endcapture %}
{% include slide-section %}


##### Dependencies with subtree

Expand Down Expand Up @@ -263,7 +262,7 @@ $ git merge --squash
{% capture slide %}
### Signing work
{% endcapture %}
{% include slide-section %}


#### By commit message
Adds a rigorously formatted text block to commit messages:
Expand All @@ -282,15 +281,15 @@ Adds a rigorously formatted text block to commit messages:
{% capture slide %}
### Cleaning
{% endcapture %}
{% include slide-section %}





{% capture slide %}
### Diff & merge tool
{% endcapture %}
{% include slide-section %}


#### Summary
* [P4Merge](http://www.perforce.com/downloads/Perforce/20-User)
Expand Down Expand Up @@ -348,7 +347,7 @@ A sample `.gitconfig` file:
{% capture slide %}
### Refspecs
{% endcapture %}
{% include slide-section %}


##### Git Refspec Documentation
* [Git `rev-parse` command and reference specifications](https://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html)
Expand Down

0 comments on commit 238aa91

Please sign in to comment.