-
-
Notifications
You must be signed in to change notification settings - Fork 381
Fix git and github lesson #133
Fix git and github lesson #133
Conversation
Apologies for my mistake - YAML header looks good. |
The goal of this lesson is to introduce the students to [Git][] via | ||
# git/GitHub | ||
|
||
The goal of this lesson is to introduce the students to [git][] via |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The first form is correct. When referred to as a package, the name is capitalized as Git. The command line tool is git
.
@jiffyclub - I took a look at the commit history I tried to bring in through the commits in #79 and it looks like it completely missed your contributions, so I'm +1 to this PR, but I'd prefer to keep our capitalization changes, which are correct. Do you mind adjusting the capitalization? I can pull this branch in and apply those fixes if you don't have time, but if you're going to make an impassioned argument for lower-case "git" everywhere, I'm ready to hear it as well :) |
On Wed, Nov 06, 2013 at 09:25:14PM -0800, Matt Davis wrote:
I've pulled out the history of your branch in: git://tremily.us/swc-version-control-git.git master But it's just the first commit fda4a1a (Instructor notes for teaching |
@wking - Are you not serving an HTTP front-end to your repository? |
On Thu, Nov 07, 2013 at 08:30:21AM -0800, Aron Ahmadia wrote:
There is also an HTTP frontend 1, for those of you who stuck behind |
There really isn't much history to bring over, this file was added in a single commit. I'm fine with this PR becoming the new source commit. @ahmadia I didn't change the capitalization, I just brought the file over as is from boot-camps. I'll fix the capitalization. |
@jiffyclub - agreed that there isn't any history here to restore except your original contribution. I'll merge this in as soon as the capitalization is fixed. |
@@ -177,7 +179,7 @@ which they will need to use `git reset --hard` to get back in sync with you. | |||
- Make a change to the README file before pulling. | |||
- Try to push. | |||
- On the white board draw the situation: my repo and the remote repo have | |||
different development histories and Git doesn't know how to pull things | |||
different development histories and it doesn't know how to pull things |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
intentional?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Whoops, nope.
@jiffyclub looks ready to merge, can you quickly affirm that you intentionally went from Git -> it? |
Fixed. |
My git and GitHub lesson was somehow mistakenly attributed to The Hacker Within. See the original at https://github.com/swcarpentry/boot-camps/tree/master/version-control/git/git-and-github. I've removed it from thw-git and re-added it in misc-git/git-and-github. I'm not totally sure how the header yaml is supposed to look but I made my best guess.
This is the downside of copying material without bringing history: you lose the definitive record of authorship. 😔