From 66bb4f47b1b62fa94454204ca50608df11412c51 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 30 Mar 2017 17:53:09 -0300 Subject: add Git topic, reorder topics alphabetically --- doc/topics/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/topics/index.md b/doc/topics/index.md index 6de13d79554..1bd50d646ea 100644 --- a/doc/topics/index.md +++ b/doc/topics/index.md @@ -7,8 +7,9 @@ you through better understanding GitLab's concepts through our regular docs, and, when available, through articles (guides, tutorials, technical overviews, blog posts) and videos. -- [GitLab Installation](../install/README.md) - [Continuous Integration (GitLab CI)](../ci/README.md) +- [Git](git/index.md) +- [GitLab Installation](../install/README.md) - [GitLab Pages](../user/project/pages/index.md) >**Note:** -- cgit v1.2.1 From 199bd04428ced528eab61a4acad7eab48cab86a3 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 30 Mar 2017 17:53:25 -0300 Subject: add Git index --- doc/topics/git/index.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 doc/topics/git/index.md diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md new file mode 100644 index 00000000000..30812074874 --- /dev/null +++ b/doc/topics/git/index.md @@ -0,0 +1,46 @@ +# Git documentation + +## Getting started + +- [Git concepts](../university/training/user_training.html#git-concepts) +- [Start using Git on the command line](../gitlab-basics/start-using-git.html) +- [Command Line basic commands](../gitlab-basics/command-line-commands.html) +- [GitLab Git Cheat Sheet (download)](https://gitlab.com/gitlab-com/marketing/raw/master/design/print/git-cheatsheet/print-pdf/git-cheatsheet.pdf) +- **Articles:** + - [Git Tips & Tricks](https://about.gitlab.com/2016/12/08/git-tips-and-tricks/) +- **Third-party resources:** + - What is [Git](https://git-scm.com) + - [Version control](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control) + - [Getting Started - Git Basics](https://git-scm.com/book/en/v2/Getting-Started-Git-Basics) + - [Getting Started - Installing Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) + - [Git on the Server - GitLab](https://git-scm.com/book/en/v2/Git-on-the-Server-GitLab) + +### Branching strategies + +- **Articles:** + - [GitLab Flow](https://about.gitlab.com/2014/09/29/gitlab-flow/) +- **Third-party resources:** + - [Git Branching - Branches in a Nutshell](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) + - [Git Branching - Branching Workflows](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows) + +### Version control + +- **Presentations:** + - [GLU Course: About Version Control](https://docs.google.com/presentation/d/16sX7hUrCZyOFbpvnrAFrg6tVO5_yT98IgdAqOmXwBho/edit?usp=sharing) + +## Advanced use + +- [Custom Git Hooks](../administration/custom_hooks.html) +- [Git Attributes](../user/project/git_attributes.html) +- Git Submodules: [Using Git submodules with GitLab CI](../ci/git_submodules.html#using-git-submodules-with-gitlab-ci) + +## API + +- [Gitignore templates](../api/templates/gitignores.html) + +## Git LFS + +- [Git LFS](https://docs.gitlab.com/ce/workflow/lfs/manage_large_binaries_with_git_lfs.html) +- **Articles:** + - [Getting Started with Git LFS](https://about.gitlab.com/2017/01/30/getting-started-with-git-lfs-tutorial/) + - [Git-Annex to Git-LFS migration guide](https://docs.gitlab.com/ee/workflow/lfs/migrate_from_git_annex_to_git_lfs.html) -- cgit v1.2.1 From 3581476d0481074d6461d9809c60ddaed14e9a06 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 30 Mar 2017 18:05:40 -0300 Subject: add general info, fix links --- doc/topics/git/index.md | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md index 30812074874..8701d09289e 100644 --- a/doc/topics/git/index.md +++ b/doc/topics/git/index.md @@ -2,12 +2,13 @@ ## Getting started -- [Git concepts](../university/training/user_training.html#git-concepts) -- [Start using Git on the command line](../gitlab-basics/start-using-git.html) -- [Command Line basic commands](../gitlab-basics/command-line-commands.html) +- [Git concepts](../../university/training/user_training.html#git-concepts) +- [Start using Git on the command line](../../gitlab-basics/start-using-git.html) +- [Command Line basic commands](../../gitlab-basics/command-line-commands.html) - [GitLab Git Cheat Sheet (download)](https://gitlab.com/gitlab-com/marketing/raw/master/design/print/git-cheatsheet/print-pdf/git-cheatsheet.pdf) - **Articles:** - [Git Tips & Tricks](https://about.gitlab.com/2016/12/08/git-tips-and-tricks/) + - [8 Tips to help you work better with Git](https://about.gitlab.com/2015/02/19/8-tips-to-help-you-work-better-with-git/) - **Third-party resources:** - What is [Git](https://git-scm.com) - [Version control](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control) @@ -30,17 +31,24 @@ ## Advanced use -- [Custom Git Hooks](../administration/custom_hooks.html) -- [Git Attributes](../user/project/git_attributes.html) -- Git Submodules: [Using Git submodules with GitLab CI](../ci/git_submodules.html#using-git-submodules-with-gitlab-ci) +- [Custom Git Hooks](../../administration/custom_hooks.html) +- [Git Attributes](../../user/project/git_attributes.html) +- Git Submodules: [Using Git submodules with GitLab CI](../../ci/git_submodules.html#using-git-submodules-with-gitlab-ci) ## API -- [Gitignore templates](../api/templates/gitignores.html) +- [Gitignore templates](../../api/templates/gitignores.html) ## Git LFS - [Git LFS](https://docs.gitlab.com/ce/workflow/lfs/manage_large_binaries_with_git_lfs.html) +- [Git-Annex to Git-LFS migration guide](https://docs.gitlab.com/ee/workflow/lfs/migrate_from_git_annex_to_git_lfs.html) - **Articles:** - [Getting Started with Git LFS](https://about.gitlab.com/2017/01/30/getting-started-with-git-lfs-tutorial/) - - [Git-Annex to Git-LFS migration guide](https://docs.gitlab.com/ee/workflow/lfs/migrate_from_git_annex_to_git_lfs.html) + - [Towards a production quality open source Git LFS server](https://about.gitlab.com/2015/08/13/towards-a-production-quality-open-source-git-lfs-server/) + +## General information + +- **Articles:** + - [The future of SaaS hosted Git repository pricing](https://about.gitlab.com/2016/05/11/git-repository-pricing/) + - [Did you install GitLab from source? Check your Git version](https://about.gitlab.com/2015/06/12/did-you-install-gitlab-from-source-recently-check-your-git-version/) -- cgit v1.2.1 From 4e1d1b8bc7a5b5ce41b8e181ad07b1d563fa0aa6 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 30 Mar 2017 18:15:36 -0300 Subject: add intro, move version control to getting started --- doc/topics/git/index.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md index 8701d09289e..2d6bb1fe1e8 100644 --- a/doc/topics/git/index.md +++ b/doc/topics/git/index.md @@ -1,5 +1,16 @@ # Git documentation +Git is a [free and open source](https://git-scm.com/about/free-and-open-source) +distributed version control system designed to handle everything from small to +very large projects with speed and efficiency. + +[GitLab](https://about.gitlab.com) is a Git-based fully integrated platform for +software development. It has all functionalities Git has, plus a lot of +powerful [features](https://about.gitlab.com/features/) to enhance your +[workflow](https://about.gitlab.com/2016/10/25/gitlab-workflow-an-overview/). + +We've gathered some resources to help you to get the best from Git with GitLab. + ## Getting started - [Git concepts](../../university/training/user_training.html#git-concepts) @@ -8,7 +19,9 @@ - [GitLab Git Cheat Sheet (download)](https://gitlab.com/gitlab-com/marketing/raw/master/design/print/git-cheatsheet/print-pdf/git-cheatsheet.pdf) - **Articles:** - [Git Tips & Tricks](https://about.gitlab.com/2016/12/08/git-tips-and-tricks/) - - [8 Tips to help you work better with Git](https://about.gitlab.com/2015/02/19/8-tips-to-help-you-work-better-with-git/) + - [Eight Tips to help you work better with Git](https://about.gitlab.com/2015/02/19/8-tips-to-help-you-work-better-with-git/) +- **Presentations:** + - [GLU Course: About Version Control](https://docs.google.com/presentation/d/16sX7hUrCZyOFbpvnrAFrg6tVO5_yT98IgdAqOmXwBho/edit?usp=sharing) - **Third-party resources:** - What is [Git](https://git-scm.com) - [Version control](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control) @@ -24,11 +37,6 @@ - [Git Branching - Branches in a Nutshell](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) - [Git Branching - Branching Workflows](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows) -### Version control - -- **Presentations:** - - [GLU Course: About Version Control](https://docs.google.com/presentation/d/16sX7hUrCZyOFbpvnrAFrg6tVO5_yT98IgdAqOmXwBho/edit?usp=sharing) - ## Advanced use - [Custom Git Hooks](../../administration/custom_hooks.html) -- cgit v1.2.1 From e0fba6e5cf5d9d2846efec1b9bc4cffcdae5bec7 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 30 Mar 2017 18:16:20 -0300 Subject: fix heading --- doc/topics/git/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md index 2d6bb1fe1e8..5afc5b09eef 100644 --- a/doc/topics/git/index.md +++ b/doc/topics/git/index.md @@ -29,7 +29,7 @@ We've gathered some resources to help you to get the best from Git with GitLab. - [Getting Started - Installing Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) - [Git on the Server - GitLab](https://git-scm.com/book/en/v2/Git-on-the-Server-GitLab) -### Branching strategies +## Branching strategies - **Articles:** - [GitLab Flow](https://about.gitlab.com/2014/09/29/gitlab-flow/) -- cgit v1.2.1 From 9fa06abe78881fae349d11f83383f398c68945f7 Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Thu, 30 Mar 2017 18:20:53 -0300 Subject: replace relative urls - html to md --- doc/topics/git/index.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md index 5afc5b09eef..88baeddcb94 100644 --- a/doc/topics/git/index.md +++ b/doc/topics/git/index.md @@ -13,9 +13,9 @@ We've gathered some resources to help you to get the best from Git with GitLab. ## Getting started -- [Git concepts](../../university/training/user_training.html#git-concepts) -- [Start using Git on the command line](../../gitlab-basics/start-using-git.html) -- [Command Line basic commands](../../gitlab-basics/command-line-commands.html) +- [Git concepts](../../university/training/user_training.md#git-concepts) +- [Start using Git on the command line](../../gitlab-basics/start-using-git.md) +- [Command Line basic commands](../../gitlab-basics/command-line-commands.md) - [GitLab Git Cheat Sheet (download)](https://gitlab.com/gitlab-com/marketing/raw/master/design/print/git-cheatsheet/print-pdf/git-cheatsheet.pdf) - **Articles:** - [Git Tips & Tricks](https://about.gitlab.com/2016/12/08/git-tips-and-tricks/) @@ -39,17 +39,17 @@ We've gathered some resources to help you to get the best from Git with GitLab. ## Advanced use -- [Custom Git Hooks](../../administration/custom_hooks.html) -- [Git Attributes](../../user/project/git_attributes.html) -- Git Submodules: [Using Git submodules with GitLab CI](../../ci/git_submodules.html#using-git-submodules-with-gitlab-ci) +- [Custom Git Hooks](../../administration/custom_hooks.md) +- [Git Attributes](../../user/project/git_attributes.md) +- Git Submodules: [Using Git submodules with GitLab CI](../../ci/git_submodules.md#using-git-submodules-with-gitlab-ci) ## API -- [Gitignore templates](../../api/templates/gitignores.html) +- [Gitignore templates](../../api/templates/gitignores.md) ## Git LFS -- [Git LFS](https://docs.gitlab.com/ce/workflow/lfs/manage_large_binaries_with_git_lfs.html) +- [Git LFS](../../workflow/lfs/manage_large_binaries_with_git_lfs.md) - [Git-Annex to Git-LFS migration guide](https://docs.gitlab.com/ee/workflow/lfs/migrate_from_git_annex_to_git_lfs.html) - **Articles:** - [Getting Started with Git LFS](https://about.gitlab.com/2017/01/30/getting-started-with-git-lfs-tutorial/) -- cgit v1.2.1 From 335d746b43351ab6423aae0cf996c5310893036b Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Tue, 11 Apr 2017 01:33:37 -0300 Subject: remove unnecessary line --- doc/topics/index.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/topics/index.md b/doc/topics/index.md index 1bd50d646ea..0d367bae204 100644 --- a/doc/topics/index.md +++ b/doc/topics/index.md @@ -12,6 +12,4 @@ tutorials, technical overviews, blog posts) and videos. - [GitLab Installation](../install/README.md) - [GitLab Pages](../user/project/pages/index.md) ->**Note:** -Non-linked topics are currently under development and subjected to change. -More topics will be available soon. +>**Note:** More topics will be available soon. -- cgit v1.2.1 From 991cb916e1d5b6269c8f90ea7cb32eed47eed4ea Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Tue, 11 Apr 2017 01:33:47 -0300 Subject: Axil's review --- doc/topics/git/index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md index 88baeddcb94..b99ba317a43 100644 --- a/doc/topics/git/index.md +++ b/doc/topics/git/index.md @@ -5,7 +5,7 @@ distributed version control system designed to handle everything from small to very large projects with speed and efficiency. [GitLab](https://about.gitlab.com) is a Git-based fully integrated platform for -software development. It has all functionalities Git has, plus a lot of +software development. Besides Git's functionalities, GitLab has a lot of powerful [features](https://about.gitlab.com/features/) to enhance your [workflow](https://about.gitlab.com/2016/10/25/gitlab-workflow-an-overview/). @@ -59,4 +59,3 @@ We've gathered some resources to help you to get the best from Git with GitLab. - **Articles:** - [The future of SaaS hosted Git repository pricing](https://about.gitlab.com/2016/05/11/git-repository-pricing/) - - [Did you install GitLab from source? Check your Git version](https://about.gitlab.com/2015/06/12/did-you-install-gitlab-from-source-recently-check-your-git-version/) -- cgit v1.2.1