Skip to content

Commit 1d94fda

Browse files
mattmakaimattmakai
committed
more work on git page
1 parent 384f3c4 commit 1d94fda

File tree

6 files changed

+154
-92
lines changed

6 files changed

+154
-92
lines changed

‎all.html‎

Lines changed: 53 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,13 +1504,18 @@ <h2>Source control projects</h2>
15041504
today's Python development world. The two primary choices are:</p>
15051505
<ul>
15061506
<li>
1507-
<p><a href="http://git-scm.com/">Git</a> is a free and open source distributed version
1507+
<p><a href="/git.html">Git</a> is a free and open source distributed version
15081508
control system.</p>
15091509
</li>
15101510
<li>
15111511
<p><a href="http://mercurial.selenic.com/">Mercurial</a> is similar to Git, also a free
15121512
and open source distributed version control system.</p>
15131513
</li>
1514+
<li>
1515+
<p><a href="https://subversion.apache.org/">Subversion</a> is a centralized system where
1516+
developers must check files in and out of the hosted repository to minimize
1517+
merge conflicts.</p>
1518+
</li>
15141519
</ul>
15151520
<h2>Hosted source control services</h2>
15161521
<p>Git and Mercurial can be downloaded and run on your own server. However,
@@ -1573,12 +1578,12 @@ <h2>General source control resources</h2>
15731578
</li>
15741579
</ul>
15751580
<h2>Git resources</h2>
1581+
<p>The following resources provide a good start for developers new to source
1582+
control and Git. There is also an
1583+
<a href="/git.html">entire page on using Git with Python</a> with many more links
1584+
sorted by categories such as solving tactical issues and Git workflows.</p>
15761585
<ul>
15771586
<li>
1578-
<p><a href="http://git-scm.com/book">Pro Git</a> is a free open source book that walks
1579-
through all aspects of using the version control system.</p>
1580-
</li>
1581-
<li>
15821587
<p><a href="http://maryrosecook.com/blog/post/git-in-six-hundred-words">Git in Six Hundred Words</a>
15831588
is a clear and concise essay explaining the fundamental concepts of
15841589
Git.</p>
@@ -1604,34 +1609,6 @@ <h2>Git resources</h2>
16041609
through example Git commands. This is a highly recommended read after you've
16051610
grasped the basics and are looking to go deeper with Git.</p>
16061611
</li>
1607-
<li>
1608-
<p><a href="http://gitready.com/">git ready</a> has a nice collection of blog posts based on
1609-
beginner, intermediate and advanced Git use cases.</p>
1610-
</li>
1611-
<li>
1612-
<p><a href="http://nvie.com/posts/a-successful-git-branching-model/">git-flow</a> details
1613-
a Git branching model for small teams.</p>
1614-
</li>
1615-
<li>
1616-
<p><a href="http://scottchacon.com/2011/08/31/github-flow.html">GitHub Flow</a> builds on
1617-
git-flow, goes over some of the issues that arise with it and presents a
1618-
few solutions to those problems.</p>
1619-
</li>
1620-
<li>
1621-
<p><a href="http://blog.endpoint.com/2014/05/git-workflows-that-work.html">Git Workflows That Work</a>
1622-
is a helpful post with diagrams to show how teams can create a Git workflow
1623-
that will help their development process.</p>
1624-
</li>
1625-
<li>
1626-
<p>"<a href="http://www.braintreepaymentsolutions.com/devblog/our-git-workflow">Our Git Workflow</a>"
1627-
by Braintree goes over how this payments company uses Git for development
1628-
and merging source code.</p>
1629-
</li>
1630-
<li>
1631-
<p><a href="https://robots.thoughtbot.com/code-sleuthing-with-git">Code Sleuthing with Git</a>
1632-
shows how to review past changes when a deployment goes wrong to figure
1633-
out what the heck happened.</p>
1634-
</li>
16351612
</ul>
16361613
<h2>Source control learning checklist</h2>
16371614
<ol>
@@ -1691,6 +1668,16 @@ <h2>Git tutorials</h2>
16911668
gives a beginner's Git overview for non-programmers. The tutorial also
16921669
covers using Git clients such as the GitHub desktop application.</p>
16931670
</li>
1671+
<li>
1672+
<p><a href="http://maryrosecook.com/blog/post/git-in-six-hundred-words">Git in Six Hundred Words</a>
1673+
is a concise essay explaining what happens when you add and commit files
1674+
in a Git repository.</p>
1675+
</li>
1676+
<li>
1677+
<p>A
1678+
<a href="http://marc.helbling.fr/2014/09/practical-git-introduction">practical git introduction</a>
1679+
is rich with pragmatic examples for Git usage.</p>
1680+
</li>
16941681
</ul>
16951682
<h2>Specific Git resources</h2>
16961683
<p>Large tutorials are great for getting started with Git. However, sometimes
@@ -1738,6 +1725,39 @@ <h2>Specific Git resources</h2>
17381725
own list of <a href="https://hackernoon.com/lesser-known-git-commands-151a1918a60">lesser known Git commands</a>
17391726
that alias more complicated Git lines.</p>
17401727
</li>
1728+
<li>
1729+
<p><a href="https://codewords.recurse.com/issues/two/git-from-the-inside-out">Git from the inside out</a>
1730+
demonstrates how Git's graph-based data structure produces certain behavior
1731+
through example Git commands. This is a highly recommended read after you've
1732+
grasped the basics and are looking to go deeper with Git.</p>
1733+
</li>
1734+
</ul>
1735+
<h2>Git Workflows</h2>
1736+
<p>Teams of developers can use Git in varying workflows because of Git's
1737+
distributed model and lightweight branching. There is no "right way" to
1738+
use Git, especially because development teams can range in size from a
1739+
single developer up to entire companies with thousands of developers in
1740+
a repository. The only correct answer is to let the developers decide on
1741+
a workflow that maximizes their ability to frequently commit code and
1742+
minimize merge conflicts.</p>
1743+
<ul>
1744+
<li>
1745+
<p><a href="http://nvie.com/posts/a-successful-git-branching-model/">git-flow</a> shows
1746+
one possible way for small teams to use Git branches.
1747+
<a href="http://scottchacon.com/2011/08/31/github-flow.html">GitHub Flow</a> explains
1748+
why at GitHub they do not use the git-flow model and provides an
1749+
alternative that solves some of the issues they found with git-flow.</p>
1750+
</li>
1751+
<li>
1752+
<p><a href="http://blog.endpoint.com/2014/05/git-workflows-that-work.html">Git Workflows That Work</a>
1753+
is a helpful post with diagrams to show how teams can create a Git workflow
1754+
that will help their development process.</p>
1755+
</li>
1756+
<li>
1757+
<p>"<a href="http://www.braintreepaymentsolutions.com/devblog/our-git-workflow">Our Git Workflow</a>"
1758+
by Braintree goes over how this payments company uses Git for development
1759+
and merging source code.</p>
1760+
</li>
17411761
</ul>
17421762
<h1>Application Dependencies</h1>
17431763
<p>Application dependencies are the libraries other than your project code

‎git.html‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,16 @@ <h2>Git tutorials</h2>
7070
gives a beginner's Git overview for non-programmers. The tutorial also
7171
covers using Git clients such as the GitHub desktop application.</p>
7272
</li>
73+
<li>
74+
<p><a href="http://maryrosecook.com/blog/post/git-in-six-hundred-words">Git in Six Hundred Words</a>
75+
is a concise essay explaining what happens when you add and commit files
76+
in a Git repository.</p>
77+
</li>
78+
<li>
79+
<p>A
80+
<a href="http://marc.helbling.fr/2014/09/practical-git-introduction">practical git introduction</a>
81+
is rich with pragmatic examples for Git usage.</p>
82+
</li>
7383
</ul>
7484
<h2>Specific Git resources</h2>
7585
<p>Large tutorials are great for getting started with Git. However, sometimes
@@ -117,6 +127,39 @@ <h2>Specific Git resources</h2>
117127
own list of <a href="https://hackernoon.com/lesser-known-git-commands-151a1918a60">lesser known Git commands</a>
118128
that alias more complicated Git lines.</p>
119129
</li>
130+
<li>
131+
<p><a href="https://codewords.recurse.com/issues/two/git-from-the-inside-out">Git from the inside out</a>
132+
demonstrates how Git's graph-based data structure produces certain behavior
133+
through example Git commands. This is a highly recommended read after you've
134+
grasped the basics and are looking to go deeper with Git.</p>
135+
</li>
136+
</ul>
137+
<h2>Git Workflows</h2>
138+
<p>Teams of developers can use Git in varying workflows because of Git's
139+
distributed model and lightweight branching. There is no "right way" to
140+
use Git, especially because development teams can range in size from a
141+
single developer up to entire companies with thousands of developers in
142+
a repository. The only correct answer is to let the developers decide on
143+
a workflow that maximizes their ability to frequently commit code and
144+
minimize merge conflicts.</p>
145+
<ul>
146+
<li>
147+
<p><a href="http://nvie.com/posts/a-successful-git-branching-model/">git-flow</a> shows
148+
one possible way for small teams to use Git branches.
149+
<a href="http://scottchacon.com/2011/08/31/github-flow.html">GitHub Flow</a> explains
150+
why at GitHub they do not use the git-flow model and provides an
151+
alternative that solves some of the issues they found with git-flow.</p>
152+
</li>
153+
<li>
154+
<p><a href="http://blog.endpoint.com/2014/05/git-workflows-that-work.html">Git Workflows That Work</a>
155+
is a helpful post with diagrams to show how teams can create a Git workflow
156+
that will help their development process.</p>
157+
</li>
158+
<li>
159+
<p>"<a href="http://www.braintreepaymentsolutions.com/devblog/our-git-workflow">Our Git Workflow</a>"
160+
by Braintree goes over how this payments company uses Git for development
161+
and merging source code.</p>
162+
</li>
120163
</ul>
121164
<h3>What else do you want to learn about?</h3>
122165
<div class="row">

‎source-control.html‎

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,18 @@ <h2>Source control projects</h2>
7070
today's Python development world. The two primary choices are:</p>
7171
<ul>
7272
<li>
73-
<p><a href="http://git-scm.com/">Git</a> is a free and open source distributed version
73+
<p><a href="/git.html">Git</a> is a free and open source distributed version
7474
control system.</p>
7575
</li>
7676
<li>
7777
<p><a href="http://mercurial.selenic.com/">Mercurial</a> is similar to Git, also a free
7878
and open source distributed version control system.</p>
7979
</li>
80+
<li>
81+
<p><a href="https://subversion.apache.org/">Subversion</a> is a centralized system where
82+
developers must check files in and out of the hosted repository to minimize
83+
merge conflicts.</p>
84+
</li>
8085
</ul>
8186
<h2>Hosted source control services</h2>
8287
<p>Git and Mercurial can be downloaded and run on your own server. However,
@@ -139,12 +144,12 @@ <h2>General source control resources</h2>
139144
</li>
140145
</ul>
141146
<h2>Git resources</h2>
147+
<p>The following resources provide a good start for developers new to source
148+
control and Git. There is also an
149+
<a href="/git.html">entire page on using Git with Python</a> with many more links
150+
sorted by categories such as solving tactical issues and Git workflows.</p>
142151
<ul>
143152
<li>
144-
<p><a href="http://git-scm.com/book">Pro Git</a> is a free open source book that walks
145-
through all aspects of using the version control system.</p>
146-
</li>
147-
<li>
148153
<p><a href="http://maryrosecook.com/blog/post/git-in-six-hundred-words">Git in Six Hundred Words</a>
149154
is a clear and concise essay explaining the fundamental concepts of
150155
Git.</p>
@@ -170,34 +175,6 @@ <h2>Git resources</h2>
170175
through example Git commands. This is a highly recommended read after you've
171176
grasped the basics and are looking to go deeper with Git.</p>
172177
</li>
173-
<li>
174-
<p><a href="http://gitready.com/">git ready</a> has a nice collection of blog posts based on
175-
beginner, intermediate and advanced Git use cases.</p>
176-
</li>
177-
<li>
178-
<p><a href="http://nvie.com/posts/a-successful-git-branching-model/">git-flow</a> details
179-
a Git branching model for small teams.</p>
180-
</li>
181-
<li>
182-
<p><a href="http://scottchacon.com/2011/08/31/github-flow.html">GitHub Flow</a> builds on
183-
git-flow, goes over some of the issues that arise with it and presents a
184-
few solutions to those problems.</p>
185-
</li>
186-
<li>
187-
<p><a href="http://blog.endpoint.com/2014/05/git-workflows-that-work.html">Git Workflows That Work</a>
188-
is a helpful post with diagrams to show how teams can create a Git workflow
189-
that will help their development process.</p>
190-
</li>
191-
<li>
192-
<p>"<a href="http://www.braintreepaymentsolutions.com/devblog/our-git-workflow">Our Git Workflow</a>"
193-
by Braintree goes over how this payments company uses Git for development
194-
and merging source code.</p>
195-
</li>
196-
<li>
197-
<p><a href="https://robots.thoughtbot.com/code-sleuthing-with-git">Code Sleuthing with Git</a>
198-
shows how to review past changes when a deployment goes wrong to figure
199-
out what the heck happened.</p>
200-
</li>
201178
</ul>
202179
<h2>Source control learning checklist</h2>
203180
<ol>

‎source/content/pages/02-development-environments/07-source-control.markdown‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ meta: Source control versions and backs up code for when programming problems oc
1111
Source control, also known as *version control*, stores software code files
1212
with a detailed history of every modification made to those files.
1313

14+
1415
## Why is source control necessary?
1516
Version control systems allow developers to modify code without worrying
1617
about permanently screwing something up. Unwanted changes can be easily rolled
@@ -26,6 +27,7 @@ development time, codebase size or the programming language used. Every
2627
project should immediately begin by using a version control system such
2728
as Git or Mercurial.
2829

30+
2931
## Source control during deployment
3032
Pulling code during a deployment is a potential way source control systems fit
3133
into the deployment process.
@@ -48,12 +50,16 @@ complicated software projects in existence. There's no reason why your project
4850
should use anything other than an open source version control system in
4951
today's Python development world. The two primary choices are:
5052

51-
* [Git](http://git-scm.com/) is a free and open source distributed version
53+
* [Git](/git.html) is a free and open source distributed version
5254
control system.
5355

5456
* [Mercurial](http://mercurial.selenic.com/) is similar to Git, also a free
5557
and open source distributed version control system.
5658

59+
* [Subversion](https://subversion.apache.org/) is a centralized system where
60+
developers must check files in and out of the hosted repository to minimize
61+
merge conflicts.
62+
5763

5864
## Hosted source control services
5965
Git and Mercurial can be downloaded and run on your own server. However,
@@ -105,8 +111,10 @@ reviews the basics of distributed version control systems.
105111

106112

107113
## Git resources
108-
* [Pro Git](http://git-scm.com/book) is a free open source book that walks
109-
through all aspects of using the version control system.
114+
The following resources provide a good start for developers new to source
115+
control and Git. There is also an
116+
[entire page on using Git with Python](/git.html) with many more links
117+
sorted by categories such as solving tactical issues and Git workflows.
110118

111119
* [Git in Six Hundred Words](http://maryrosecook.com/blog/post/git-in-six-hundred-words)
112120
is a clear and concise essay explaining the fundamental concepts of
@@ -129,28 +137,6 @@ reviews the basics of distributed version control systems.
129137
through example Git commands. This is a highly recommended read after you've
130138
grasped the basics and are looking to go deeper with Git.
131139

132-
* [git ready](http://gitready.com/) has a nice collection of blog posts based on
133-
beginner, intermediate and advanced Git use cases.
134-
135-
* [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) details
136-
a Git branching model for small teams.
137-
138-
* [GitHub Flow](http://scottchacon.com/2011/08/31/github-flow.html) builds on
139-
git-flow, goes over some of the issues that arise with it and presents a
140-
few solutions to those problems.
141-
142-
* [Git Workflows That Work](http://blog.endpoint.com/2014/05/git-workflows-that-work.html)
143-
is a helpful post with diagrams to show how teams can create a Git workflow
144-
that will help their development process.
145-
146-
* "[Our Git Workflow](http://www.braintreepaymentsolutions.com/devblog/our-git-workflow)"
147-
by Braintree goes over how this payments company uses Git for development
148-
and merging source code.
149-
150-
* [Code Sleuthing with Git](https://robots.thoughtbot.com/code-sleuthing-with-git)
151-
shows how to review past changes when a deployment goes wrong to figure
152-
out what the heck happened.
153-
154140

155141
## Source control learning checklist
156142
1. Pick a version control system. Git is recommended because on the web there

‎source/content/pages/02-development-environments/08-git.markdown‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ developers. The following tutorials can quickly get you up to speed.
4040
gives a beginner's Git overview for non-programmers. The tutorial also
4141
covers using Git clients such as the GitHub desktop application.
4242

43+
* [Git in Six Hundred Words](http://maryrosecook.com/blog/post/git-in-six-hundred-words)
44+
is a concise essay explaining what happens when you add and commit files
45+
in a Git repository.
46+
47+
* A
48+
[practical git introduction](http://marc.helbling.fr/2014/09/practical-git-introduction)
49+
is rich with pragmatic examples for Git usage.
50+
4351

4452
## Specific Git resources
4553
Large tutorials are great for getting started with Git. However, sometimes
@@ -79,5 +87,32 @@ workflow. These resources will come in handy for specific Git subjects.
7987
own list of [lesser known Git commands](https://hackernoon.com/lesser-known-git-commands-151a1918a60)
8088
that alias more complicated Git lines.
8189

82-
90+
* [Git from the inside out](https://codewords.recurse.com/issues/two/git-from-the-inside-out)
91+
demonstrates how Git's graph-based data structure produces certain behavior
92+
through example Git commands. This is a highly recommended read after you've
93+
grasped the basics and are looking to go deeper with Git.
94+
95+
96+
## Git Workflows
97+
Teams of developers can use Git in varying workflows because of Git's
98+
distributed model and lightweight branching. There is no "right way" to
99+
use Git, especially because development teams can range in size from a
100+
single developer up to entire companies with thousands of developers in
101+
a repository. The only correct answer is to let the developers decide on
102+
a workflow that maximizes their ability to frequently commit code and
103+
minimize merge conflicts.
104+
105+
* [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) shows
106+
one possible way for small teams to use Git branches.
107+
[GitHub Flow](http://scottchacon.com/2011/08/31/github-flow.html) explains
108+
why at GitHub they do not use the git-flow model and provides an
109+
alternative that solves some of the issues they found with git-flow.
83110

111+
* [Git Workflows That Work](http://blog.endpoint.com/2014/05/git-workflows-that-work.html)
112+
is a helpful post with diagrams to show how teams can create a Git workflow
113+
that will help their development process.
114+
115+
* "[Our Git Workflow](http://www.braintreepaymentsolutions.com/devblog/our-git-workflow)"
116+
by Braintree goes over how this payments company uses Git for development
117+
and merging source code.
118+

‎source/content/pages/12-meta/01-change-log.markdown‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ inception in December 2012. You can view detailed changes via the
1515

1616
## 2017
1717
### January
18+
* Further work on the [Git](/git.html) page.
1819
* New [Git](/git.html) page.
1920
* New resources and descriptions on the
2021
[development environments](/development-environments.html) page.

0 commit comments

Comments
 (0)