diff --git a/01-gitlab-basics/README.md b/01-gitlab-basics/README.md index 89e8bf8a9b8b6cd0c3dd5bff49ffba0f164b89c4..8b2c6a63b0853066df232e96510918171010b066 100644 --- a/01-gitlab-basics/README.md +++ b/01-gitlab-basics/README.md @@ -1,19 +1,21 @@ -# Git Basics +# Git(Lab) Basics -## What's a repository ? +## Some definitions + +### What's a repository ? A repository is a hierarchy of folders (directories) to store your project files and folders *as well as additional files used by Git to keep track of all operations performed on your project files and folders*. - ### Is each project stored in a single repository ? + #### Is each project stored in a single repository ? Git is a distributed version management system. A specific project can be stored in multiple repositories. Usually, there is one reference repository used by all project contributors. All contributors have a local or work repository, which they initially cloned from the reference repository (more on this later). -## What's a Branch ? +### What's a Branch ? In short: a branch is a name used to track the history of changes to files and folders over time, as a series of commits. A repository can manage as many branches as needed (more on this later). When working on a Git project, there is always a *current* branch. Git provides operations to create/remove/switch between branches. -## What's a Commit ? +### What's a Commit ? In short: a commit is a set of changes to files or folders that we want Git to keep track of, such as: - Addition a file or folder @@ -24,7 +26,7 @@ In short: a commit is a set of changes to files or folders that we want Git to k Git provides operations to specify which files should be part of a commit. -## Create Your First Repository +## Creating a Repository ### [Log In to GitLab](./media/gitlab-login.mp4) @@ -44,22 +46,22 @@ Log in to GitLab using your favourite account settings (GitLab, Google, GitHub,  -## GitLab User Interface Main Panels +### GitLab User Interface Main Panels -### Project Summary Information +#### Project Summary Information Recap with your project's name the number of _commits_, _branches_ (more on these soon) and _tags_ as well as storage space occupied by project files.  -### Current View and Most Recent Activity +#### Current View and Most Recent Activity Which _branch_ are we looking at ? What was the most recent activity in this branch ?  -### Files / Folders in the Current View +#### Files / Folders in the Current View Which files folders are part of the current _branch_ ? If there's a `README.md` file, what's its contents ? diff --git a/README.md b/README.md index 3d53b73a01d9ce5747832243ad7ea533de688f75..bc593948992eebfd6b555859ae2a8057ccd93a97 100644 --- a/README.md +++ b/README.md @@ -12,22 +12,22 @@ Training material for the Git for Beginners ABiMS training session ### Trainee Setup Testing 1. Does everyone have an account on GitLab ? -### Git(Lab) Basics +### [Git(Lab) Basics](./01-gitlab-basics/README.md) 1. Some definitions 1. Creating a repository - 1. Adding / editing / removing files & folders + 1. Using the Web IDE 1. Committing changes -### Using Remote Repositories +### [Working with Remote Repositories](./02-gitlab-clone/README.md) 1. Motivation 1. Cloning a GitLab repository 1. Cloning using HTTPS 1. CLoning using SSH -### Git Command Line Basics +### [Git Command Line Basics](./03-cli-basics/README.md) 1. Displaying information about a local repository - 1. Making changes to the local repository - 1. Committing changes to the local repository + 1. Making changes to a local repository + 1. Committing changes to a local repository 1. Propagating changes to the remote repository 1. Keeping a local repository synchronized with a remote repository