Commit1f4861d

committed

update some git

1 parent7d8e9e0 commit1f4861dCopy full SHA for 1f4861d

File tree

+29

-11

lines changed

+29

-11

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,13 @@ parts:`
`75`	`75`	`-file:09-packages/python-packages`
`76`	`76`	`-file:09-packages/python-tools`
`77`	`77`
	`78`	`+ -caption:Git and Github`
	`79`	`+chapters:`
	`80`	`+ -file:git/version-control`
	`81`	`+ -file:git/git`
	`82`	`+ -file:git/github`
	`83`	`+ -file:git/pull-requests`
	`84`	`+`
`78`	`85`	`-caption:Unit tests`
`79`	`86`	`chapters:`
`80`	`87`	`-file:10-testing/testing`
`@@ -88,9 +95,3 @@ parts:`
`88`	`95`	`-file:12-extensions/extensions-overview`
`89`	`96`	`-file:12-extensions/extensions-example`
`90`	`97`
`91`		`- -caption:Git and Github`
`92`		`-chapters:`
`93`		`- -file:git/version-control`
`94`		`- -file:git/git`
`95`		`- -file:git/github`
`96`		`- -file:git/pull-requests`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ git config --global core.editor "nano -w"`
`29`	`29`
`30`	`30`	Replace`name` with your name and`email` with your email. This sets`nano`
`31`	`31`	`as our default editor, but you can choose something else that you are comfortable`
`32`		`-with (seehttps://swcarpentry.github.io/git-novice/02-setup/index.html#line-endings).`
	`32`	`+with (seehttps://swcarpentry.github.io/git-novice/02-setup.html).`
`33`	`33`
`34`	`34`	This information will be stored in a file called``.gitconfig`` in your home directory.
`35`	`35`
`@@ -99,7 +99,7 @@ project.`
`99`	`99`
`100`	`100`	```
`101`	`101`	`commit 2001a0e996110926a576dcb5fc13fc8022864d0b (HEAD -> main)`
`102`		`- Author: Michael Zingale <michael.zingake@stonybrook.edu>`
	`102`	`+ Author: Michael Zingale <michael.zingale@stonybrook.edu>`
`103`	`103`	`Date: Sun Jan 30 13:11:24 2022 -0500`
`104`	`104`
`105`	`105`	`my first change`
`@@ -165,8 +165,7 @@ project.`
`165`	`165`	`modified: README`
`166`	`166`	```
`167`	`167`
`168`		-```{note}
`169`		`- What is add really doing?`
	`168`	+ ```{admonition} What is`add` really doing?
`170`	`169`
`171`	`170`	Git has a concept call thestaging area. When we``add`` a
`172`	`171`	`file, git puts the changes into the staging area. We can add`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,23 @@`
`1`	`1`	`#Version Control`
`2`	`2`
	`3`	+````{note}
	`4`	+To follow along, you will need to install `git` on your computer.
	`5`	`+You can follow the instructions from the [Software Carpentry lessons](https://carpentries.github.io/workshop-template/install_instructions/#git). In particular, for:`
	`6`	`+`
	`7`	`+* Windows: use [git for Windows](https://gitforwindows.org/)`
	`8`	`+`
	`9`	`+* Mac: in a teminal, do:`
	`10`	`+`
	`11`	+ ```
	`12`	`+ git --version`
	`13`	+ ```
	`14`	`+`
	`15`	`+ If it is not already installed, it will prompt you for installation.`
	`16`	`+`
	`17`	`+* Linux: it is probably already installed, but otherwise, use your`
	`18`	`+ package manager.`
	`19`	+````
	`20`	`+`
`3`	`21`	`##Why use version control?`
`4`	`22`
`5`	`23`	`When we develop code, we are going to be making lots of changes over`
`@@ -13,7 +31,7 @@ time. And you will find yourself in the following situations:`
`13`	`31`	`*Your research group is all working on the same code and you need to sync up with`
`14`	`32`	`everyone's changes and make sure that no one breaks the code.`
`15`	`33`
`16`		`-This is what version control does for us.`
	`34`	`+This is what[version control](https://en.wikipedia.org/wiki/Version_control) does for us.`
`17`	`35`
`18`	`36`
`19`	`37`	```{note}

Comments

(0)