githubteacher / intermediate-april-2015 Goto Github PK

View Code? Open in Web Editor NEW

3.0 34.0 4.0 146 KB

A demo repo for our April Intermediate class.

C++ 76.06% Python 23.94%

intermediate-april-2015's Introduction

A demo repo for our April Intermediate class.

Structure

The outline and much of the material for this course lives here.

References

GitHub help docs
Git help docs
Pro Git book A thorough introduction to Git and how to use it, including a section on GitHub.
Mastering Markdown Handy for both learning and quickly looking up Markdown syntax.
A blog post on git reset Hat tip to @pcharlan for the link.

Show Current Branch in Terminal Prompt

To get the pictured behavior, add these lines to your ~/.bashrc file:

# show current git branch in prompt
parse_git_branch() {
  git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
}
export PS1="\w\[\033[36m\]\$(parse_git_branch) \[\033[00m\] > "

intermediate-april-2015's People

Contributors

Stargazers

Watchers

Forkers

alexmoddejonge danahfc rickyrey aalten

intermediate-april-2015's Issues

Collecting handles

Please submit a comment in this issue, so that we can collect your handles and make everyone a collaborator. Thanks!

Could you do a 1-minute review of hunks?

Merge branch and know diff

Can you explain merge again and why it accept evenif we write -d, not -D ??
Thanks !

What is the difference between ignoring local changes using 'git checkout HEAD file' and 'git checkout -- file'?

git push -u origin master failed when doing from remote with out clonning

git push -u origin master failed when doing from remote with out clonning. But works while clonning the remote locally then pushing

SHA-1 outputs 120 "unique random" bits per file. 50% chance of collision between two files is 1/2^60 probability.

The estimated number of atoms in the Universe is 2^50.

fork and pulling from upstream to local fork and push back change

Please explain how to fork and push back the change to the fork. Also, pullin any changes in upstream to avoid conflict

Present and somewhat accounted for

fetch vs pull vs rebase - difference?

Can you explain the difference between a git pull and a git fetch and a git rebase?

Git help docs links to Github help

On Readme page the Git help docs links to help.github.com instead of Git docs.

Audio

If you are having audio troubles, please let us know by posting in this issue. Thanks!

WIll the video be posted on the main readme.md page?

I couldn't add a QUESTION label to this ISSUE.

how do i use command line on windows github?

It would be nice to have you explain the standard git workflow and walk through it for a project rather than explain what each flag does. In my personal opinion, the flags can be viewed by a user upon issuing the --help command.

Could you please focus a bit more on the reason for performing the steps in the workflow a certain way rather than just doing them and explaining the commands instead?

Upload image for README

All we need is a URL...

test3

Path vs non-Path versions of commit and reset

I think it's helpful to mention that checkout with a path is arguably a different command than checkout without a path; ditto reset. I think the interfaces to those commands are some of the most confusing aspects of the CLI to new users.

Also, I found this blog entry (by Scott Chacon?) helpful when thinking about reset; perhaps it would be useful to others to point to it:

http://git-scm.com/blog/2011/07/11/reset.html