Skip to content

Slides and resources created for a talk on the concepts of git and github

License

Notifications You must be signed in to change notification settings

carolynk/git_workshop

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

25 Commits
 
 
 
 
 
 
 
 
 
 

Repository files navigation

git_workshop

install git

https://git-scm.com/downloads

learn to contribute

https://github.com/firstcontributions/first-contributions

bash_profile_example

copy commands from bash_profile_example to your .bash_profile file (in your ~ directory)

and download the following

autocomplete git commands https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash

show repo status like branch in prompt https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh

config

set up your favorite editor to handle commits and diffs

git config --global core.editor "subl -n -w"

https://docs.github.com/en/free-pro-team@latest/github/using-git/associating-text-editors-with-git

set up diff3

git config --global merge.conflictstyle diff3

https://blog.nilbus.com/take-the-pain-out-of-git-conflict-resolution-use-diff3/

resources

github cheatsheet

https://training.github.com/downloads/github-git-cheat-sheet.pdf

learn more

https://git-scm.com/doc

https://dev.to/sublimegeek/git-staging-area-explained-like-im-five-1anh

https://missing.csail.mit.edu/2020/version-control/

http://gitready.com

commit message styleguide

http://udacity.github.io/git-styleguide/

About

Slides and resources created for a talk on the concepts of git and github

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages