git-course/index.html at gh-pages · monishanatchiar/git-course · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
<!DOCTYPE html>
<html>
  <head>
    <meta charset="utf-8">
    <meta name="generator" content="pandoc">
    <title>UoM Research IT training: Version control with Git</title>
    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.css" />
    <link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-theme.css" />
    <link rel="stylesheet" type="text/css" href="css/swc.css" />
    <link rel="alternate" type="application/rss+xml" title="Software Carpentry Blog" href="http://software-carpentry.org/feed.xml"/>
    <meta charset="UTF-8" />
    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
    <!--[if lt IE 9]>
      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
    <![endif]-->
  </head>
  <body class="lesson">
    <div class="container card">
      <div class="banner">
        <!a href="http://software-carpentry.org" title="Software Carpentry">
          <!img alt="Software Carpentry banner" src="img/software-carpentry-banner.png" />
        <!/a>
        <a href="http://www.itservices.manchester.ac.uk/" title="University Of Manchester">
          <img alt="UoM banner" src="img/university-of-manchester-banner.png" />
        </a>
      </div>
      <article>
      <div class="row">
        <div class="col-md-10 col-md-offset-1">
                    <h1 class="title">Version control with Git</h1>
          <p><strong>This course is based on materials by <a href="http://www.software-carpentry.org">Software Carpentry</a></strong></p>
<section class="prereq panel panel-warning">
<div class="panel-heading">
<h2 id="prerequisites"><span class="glyphicon glyphicon-education"></span>Prerequisites</h2>
</div>
<div class="panel-body">
<p>In this lesson we use Git from the Unix Shell. Some previous experience with the shell is expected, <em>but is not mandatory</em>.</p>
<p>Alternatively, this course can be followed on Windows using Git Bash. All of the commands shown will work on Windows using Git Bash, with the exception of the <code>gedit</code> command. Gedit is a common text editor on Linux: Windows users should use the <code>notepad</code> command instead, and set notepad as the core editor when configuring Git.</p>
<p>You will need a GitHub account for the afternoon session. Please <a href="https://github.com/">sign up for an account</a> this morning if you do not already have an account.</p>
</div>
</section>
<h2 id="resources">Resources</h2>
<p><a href="http://slides.com/gcapes/git">Workshop slideshow</a></p>
<p><a href="https://services.github.com/on-demand/downloads/github-git-cheat-sheet.pdf">Git cheat sheet</a> (You may want to download a copy of this for reference during this workshop)</p>
<h2 id="topics">Topics</h2>
<ol style="list-style-type: decimal">
<li><a href="01-introduction.html">Introduction - Why use version control?</a></li>
<li><a href="02-local.html">Setting up and working with a local repository</a></li>
<li><a href="03-history.html">Looking at history and differences</a></li>
<li><a href="04-commit-advice.html">Best practice for committing changes</a></li>
<li><a href="05-branching.html">Branching, merging and resolving conflicts</a></li>
<li><a href="06-undoing.html">Undoing changes</a></li>
<li><a href="07-rebasing.html">Rebasing</a></li>
<li><a href="08-remote.html">Using remote repositories to work from different locations</a></li>
<li><a href="09-remote-collaboration.html">Collaborating using a remote repository</a></li>
<li><a href="10-pull-requests.html">Pull requests</a></li>
<li><a href="11-hints-and-tips.html">Hints and tips</a></li>
<li><a href="12-conclusion.html">Conclusion</a></li>
</ol>
<h2 id="schedule">Schedule</h2>
<p><strong>09:30 - 12:30</strong> Morning session</p>
<ul>
<li>Introduction to version control</li>
<li>Working with a local repository</li>
<li>Looking at history and differences</li>
<li>Committing changes</li>
<li>Branching, merging, resolving conflicts</li>
</ul>
<p><strong>12:30 - 13:30</strong> Lunch</p>
<p><strong>13:30 - 16:30</strong> Afternoon session</p>
<ul>
<li>Undoing changes</li>
<li>Rebasing</li>
<li>Remote repositories</li>
<li>Collaboration</li>
<li>Pull requests</li>
<li>Hints and tips</li>
<li>Conclusion</li>
</ul>
        </div>
      </div>
      </article>
      <div class="footer">
        <a class="label swc-blue-bg" href="http://software-carpentry.org">Software Carpentry</a>
        <a class="label swc-blue-bg" href="https://github.com/gcapes/git-course">Source</a>
        <a class="label swc-blue-bg" href="mailto:research-it-training@manchester.ac.uk">Contact</a>
        <a class="label swc-blue-bg" href="LICENSE.html">License</a>
      </div>
    </div>
    <!-- Javascript placed at the end of the document so the pages load faster -->
    <script src="http://software-carpentry.org/v5/js/jquery-1.9.1.min.js"></script>
    <script src="css/bootstrap/bootstrap-js/bootstrap.js"></script>
    <script src='https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'></script>
  </body>
</html>