Resolve merge request comments
This commit is contained in:
parent
ce8815139c
commit
0ac5276935
|
@ -13,21 +13,18 @@ please submit a merge request to add an upcoming class, assign to
|
|||
|
||||
## Adding classes
|
||||
|
||||
1. All training materials of any kind should be added to [the university repo](https://gitlab.com/gitlab-org/University)
|
||||
1. All training materials of any kind should be added to [GitLab CE](https://gitlab.com/gitlab-org/gitlab-ce/)
|
||||
to ensure they are available to a broad audience (don't use any other repo or
|
||||
storage for training materials).
|
||||
1. Please link any new materials from the main `university.gitlab.com` page
|
||||
1. Don't make materials that are needlessly specific to one group of people, try
|
||||
to keep the wording broad and inclusive (don't make things for only GitLab Inc.
|
||||
people, only interns, only customers, etc.).
|
||||
1. To allow people to contribute all content should be in git.
|
||||
1. The content can go in a subdirectory under `/source/`.
|
||||
1. The content can go in a subdirectory under `/doc/university/`.
|
||||
1. To make, view or modify the slides of the classes use [Deckset](http://www.decksetapp.com/)
|
||||
or [RevealJS](http://lab.hakim.se/reveal-js/). Do not use Powerpoint or Google
|
||||
Slides since this prevents everyone from contributing.
|
||||
1. Please upload any video recordings to our Youtube channel. We prefer them to
|
||||
be public, if needed they can be unlisted but if so they should be linked from
|
||||
this page.
|
||||
1. Please create a merge request and assign to [Job](https://gitlab.com/u/JobV).
|
||||
|
||||
[» Back](../)
|
||||
1. Please create a merge request and assign to [SeanPackham](https://gitlab.com/u/SeanPackham).
|
|
@ -1,5 +0,0 @@
|
|||
---
|
||||
title: University | Sales Path
|
||||
---
|
||||
|
||||
This page has been removed; please review the [Sales onboarding](https://about.gitlab.com/handbook/sales-onboarding) page instead.
|
|
@ -8,13 +8,13 @@ The goal of this boot camp is to have every Service Engineer prepared to help ou
|
|||
with whatever needs they might have and to also assist our awesome community with their
|
||||
questions.
|
||||
|
||||
Always start with the [University Overview](/) and then work
|
||||
Always start with the [University Overview](../) and then work
|
||||
your way here for more advanced and specific training. Once you feel comfortable
|
||||
with the topics of the current stage, move to the next.
|
||||
|
||||
### Stage 1
|
||||
|
||||
Follow the topics on the [University Overview](/), concentrate on it
|
||||
Follow the topics on the [University Overview](../), concentrate on it
|
||||
during your first Stage, but also:
|
||||
|
||||
- Perform the [first steps](https://about.gitlab.com/handbook/support/onboarding/#first-steps) of
|
||||
|
@ -26,7 +26,7 @@ Aim to have a good overview of the Product and main features, Git and the Compan
|
|||
|
||||
### Stage 2
|
||||
|
||||
Continue to look over remaining portions of the [University Overview](/help/university) and continue on to these topics:
|
||||
Continue to look over remaining portions of the [University Overview](../) and continue on to these topics:
|
||||
|
||||
#### Set up your development machine
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ project.
|
|||
### Getting Help
|
||||
|
||||
- Use the tools at your disposal when you get stuck.
|
||||
- Use 'git help <command>' command
|
||||
- Use `git help <command>` command
|
||||
- Use Google (i.e. StackOverflow, Google groups)
|
||||
- Read documentation at https://git-scm.com
|
||||
|
||||
|
@ -59,30 +59,30 @@ Workshop Time!
|
|||
|
||||
- Windows: Install 'Git for Windows'
|
||||
- https://git-for-windows.github.io
|
||||
- Mac: Type 'git' in the Terminal application.
|
||||
- Mac: Type `git` in the Terminal application.
|
||||
- If it's not installed, it will prompt you to install it.
|
||||
- Linux
|
||||
- Debian: 'sudo apt-get install git-all'
|
||||
- Red Hat 'sudo yum install git-all'
|
||||
- Debian: `sudo apt-get install git-all`
|
||||
- Red Hat `sudo yum install git-all`
|
||||
|
||||
---
|
||||
|
||||
### Configure
|
||||
|
||||
- One-time configuration of the Git client
|
||||
- One-time configuration of the Git client:
|
||||
|
||||
~~~ bash
|
||||
```bash
|
||||
git config --global user.name "Your Name"
|
||||
git config --global user.email you@example.com
|
||||
~~~
|
||||
```
|
||||
|
||||
- If you don't use the global flag you can setup a different author for
|
||||
each project
|
||||
- Check settings with
|
||||
- Check settings with:
|
||||
|
||||
~~~ bash
|
||||
```bash
|
||||
git config --global --list
|
||||
~~~
|
||||
```
|
||||
- You might want or be required to use an SSH key.
|
||||
- Instructions: [SSH](http://doc.gitlab.com/ce/ssh/README.html)
|
||||
|
||||
|
@ -96,7 +96,7 @@ git config --global --list
|
|||
|
||||
---
|
||||
|
||||
~~~ bash
|
||||
```bash
|
||||
mkdir ~/development
|
||||
cd ~/development
|
||||
|
||||
|
@ -104,7 +104,7 @@ cd ~/development
|
|||
|
||||
mkdir ~/workspace
|
||||
cd ~/workspace
|
||||
~~~
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
|
@ -155,7 +155,7 @@ cd ~/workspace
|
|||
|
||||
---
|
||||
|
||||
~~~ shell
|
||||
```shell
|
||||
# Edit `edit_this_file.rb`
|
||||
git status
|
||||
git diff
|
||||
|
@ -163,7 +163,7 @@ git add <file>
|
|||
git commit -m 'My change'
|
||||
git push origin master
|
||||
git log
|
||||
~~~
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
|
@ -176,14 +176,14 @@ git log
|
|||
|
||||
---
|
||||
|
||||
~~~ shell
|
||||
```shell
|
||||
git checkout -b squash_some_bugs
|
||||
# Edit `bugs.rb`
|
||||
git status
|
||||
git add bugs.rb
|
||||
git commit -m 'Fix some buggy code'
|
||||
git push origin squash_some_bugs
|
||||
~~~
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
|
@ -314,7 +314,7 @@ Create a merge request on the GitLab web UI. You'll see a conflict warning.
|
|||
|
||||
### Unstage
|
||||
|
||||
To remove files from stage use reset HEAD. Where HEAD is the last commit of the current branch.
|
||||
To remove files from stage use reset HEAD. Where HEAD is the last commit of the current branch:
|
||||
|
||||
git reset HEAD <file>
|
||||
|
||||
|
@ -322,12 +322,12 @@ This will unstage the file but maintain the modifications. To revert the file ba
|
|||
|
||||
git checkout -- <file>
|
||||
|
||||
To remove a file from disk and repo use 'git rm' and to rm a dir use the '-r' flag.
|
||||
To remove a file from disk and repo use 'git rm' and to rm a dir use the '-r' flag:
|
||||
|
||||
git rm '*.txt'
|
||||
git rm -r <dirname>
|
||||
|
||||
If we want to remove a file from the repository but keep it on disk, say we forgot to add it to our .gitignore file then use --cache.
|
||||
If we want to remove a file from the repository but keep it on disk, say we forgot to add it to our .gitignore file then use `--cache`:
|
||||
|
||||
git rm <filename> --cache
|
||||
|
||||
|
@ -335,7 +335,7 @@ If we want to remove a file from the repository but keep it on disk, say we forg
|
|||
|
||||
### Undo Commits
|
||||
|
||||
Undo last commit putting everything back into the staging area.
|
||||
Undo last commit putting everything back into the staging area:
|
||||
|
||||
git reset --soft HEAD^
|
||||
|
||||
|
@ -347,7 +347,7 @@ Undo last and remove changes
|
|||
|
||||
git reset --hard HEAD^
|
||||
|
||||
Same as last one but for two commits back
|
||||
Same as last one but for two commits back:
|
||||
|
||||
git reset --hard HEAD^^
|
||||
|
||||
|
|
Loading…
Reference in New Issue