diff options
Diffstat (limited to 'doc/topics/git')
| -rw-r--r-- | doc/topics/git/cherry_picking.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/git_add.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/git_rebase.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/how_to_install_git/index.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/index.md | 4 | ||||
| -rw-r--r-- | doc/topics/git/lfs/index.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/numerous_undo_possibilities_in_git/index.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/partial_clone.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/rollback_commits.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/stash.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/troubleshooting_git.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/unstage.md | 2 | ||||
| -rw-r--r-- | doc/topics/git/useful_git_commands.md | 2 |
13 files changed, 13 insertions, 15 deletions
diff --git a/doc/topics/git/cherry_picking.md b/doc/topics/git/cherry_picking.md index bd589562ed1..7f0da5a594e 100644 --- a/doc/topics/git/cherry_picking.md +++ b/doc/topics/git/cherry_picking.md @@ -4,7 +4,7 @@ group: Source Code info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Cherry-pick a Git commit **(FREE)** +# Cherry-pick a Git commit **(FREE ALL)** In Git, you can *cherry-pick* a commit (a set of changes) from an existing branch, and apply those changes to another branch. Cherry-picks can help you: diff --git a/doc/topics/git/git_add.md b/doc/topics/git/git_add.md index 1089202bbd3..db85e75a6a8 100644 --- a/doc/topics/git/git_add.md +++ b/doc/topics/git/git_add.md @@ -4,7 +4,7 @@ group: Source Code info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Git add **(FREE)** +# Git add **(FREE ALL)** Adds content to the index or staging area. diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md index dd2260b04dc..78275746de5 100644 --- a/doc/topics/git/git_rebase.md +++ b/doc/topics/git/git_rebase.md @@ -6,7 +6,7 @@ type: concepts, howto description: "Introduction to Git rebase and force push, methods to resolve merge conflicts through the command line." --- -# Git rebase and force push **(FREE)** +# Git rebase and force push **(FREE ALL)** This guide helps you to get started with rebases, force pushes, and fixing [merge conflicts](../../user/project/merge_requests/conflicts.md) locally. diff --git a/doc/topics/git/how_to_install_git/index.md b/doc/topics/git/how_to_install_git/index.md index f3031acf35f..40c5147e20b 100644 --- a/doc/topics/git/how_to_install_git/index.md +++ b/doc/topics/git/how_to_install_git/index.md @@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w description: 'This article describes how to install Git on macOS, Ubuntu Linux and Windows.' --- -# Installing Git **(FREE)** +# Installing Git **(FREE ALL)** To begin contributing to GitLab projects, you must install the appropriate Git client on your computer. Information about [installing Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md index d5aa74935f2..05b14b21f20 100644 --- a/doc/topics/git/index.md +++ b/doc/topics/git/index.md @@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated type: index --- -# Git **(FREE)** +# Git **(FREE ALL)** 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 @@ -36,7 +36,6 @@ The following resources can help you get started with Git: - Commits: - [Revert a commit](../../user/project/merge_requests/revert_changes.md#revert-a-commit) - [Cherry-picking a commit](../../user/project/merge_requests/cherry_pick_changes.md) - - [Squashing commits](../gitlab_flow.md#squashing-commits-with-rebase) - [Squash-and-merge](../../user/project/merge_requests/squash_and_merge.md) - [Signing commits](../../user/project/repository/gpg_signed_commits/index.md) - [Git stash](stash.md) @@ -82,7 +81,6 @@ If you have problems with Git, the following may help: ## Branching strategies - [Feature branch workflow](../../gitlab-basics/feature_branch_workflow.md) -- [GitLab Flow](../gitlab_flow.md) - [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) diff --git a/doc/topics/git/lfs/index.md b/doc/topics/git/lfs/index.md index 97e729aee55..d9c906ccd81 100644 --- a/doc/topics/git/lfs/index.md +++ b/doc/topics/git/lfs/index.md @@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated type: reference, howto --- -# Git Large File Storage (LFS) **(FREE)** +# Git Large File Storage (LFS) **(FREE ALL)** Managing large files such as audio, video and graphics files has always been one of the shortcomings of Git. The general recommendation is to not have Git repositories diff --git a/doc/topics/git/numerous_undo_possibilities_in_git/index.md b/doc/topics/git/numerous_undo_possibilities_in_git/index.md index 56223e7bcbd..8c42a394106 100644 --- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md +++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md @@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w type: howto --- -# Undo options in Git **(FREE)** +# Undo options in Git **(FREE ALL)** [Nothing in Git is deleted](https://git-scm.com/book/en/v2/Git-Internals-Maintenance-and-Data-Recovery), so when you work in Git, you can undo your work. diff --git a/doc/topics/git/partial_clone.md b/doc/topics/git/partial_clone.md index de0547ae49d..add276ad49d 100644 --- a/doc/topics/git/partial_clone.md +++ b/doc/topics/git/partial_clone.md @@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated type: reference, howto --- -# Partial clone **(FREE)** +# Partial clone **(FREE ALL)** As Git repositories grow in size, they can become cumbersome to work with because of: diff --git a/doc/topics/git/rollback_commits.md b/doc/topics/git/rollback_commits.md index d1f34c7cf9c..b86b7dbfca5 100644 --- a/doc/topics/git/rollback_commits.md +++ b/doc/topics/git/rollback_commits.md @@ -4,7 +4,7 @@ group: Source Code info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Roll back commits **(FREE)** +# Roll back commits **(FREE ALL)** ## Undo Commits diff --git a/doc/topics/git/stash.md b/doc/topics/git/stash.md index 9f621308a1d..84a09385bf6 100644 --- a/doc/topics/git/stash.md +++ b/doc/topics/git/stash.md @@ -4,7 +4,7 @@ group: Source Code info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Git stash **(FREE)** +# Git stash **(FREE ALL)** We use `git stash` to store our changes when they are not ready to be committed, but we must change to a different branch. diff --git a/doc/topics/git/troubleshooting_git.md b/doc/topics/git/troubleshooting_git.md index 502acf5f7b4..43d5d746539 100644 --- a/doc/topics/git/troubleshooting_git.md +++ b/doc/topics/git/troubleshooting_git.md @@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated type: howto --- -# Troubleshooting Git **(FREE)** +# Troubleshooting Git **(FREE ALL)** Sometimes things don't work the way they should or as you might expect when you're using Git. Here are some tips on troubleshooting and resolving issues diff --git a/doc/topics/git/unstage.md b/doc/topics/git/unstage.md index 3f509cdacef..028f34b2433 100644 --- a/doc/topics/git/unstage.md +++ b/doc/topics/git/unstage.md @@ -4,7 +4,7 @@ group: Source Code info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Unstage a file in Git **(FREE)** +# Unstage a file in Git **(FREE ALL)** When you _stage_ a file in Git, you instruct Git to track changes to the file in preparation for a commit. To instruct Git to disregard changes to a file, and not diff --git a/doc/topics/git/useful_git_commands.md b/doc/topics/git/useful_git_commands.md index e4c106e3e33..305008e2642 100644 --- a/doc/topics/git/useful_git_commands.md +++ b/doc/topics/git/useful_git_commands.md @@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated type: reference --- -# Frequently used Git commands **(FREE)** +# Frequently used Git commands **(FREE ALL)** The GitLab support team has collected these commands to help you. You may not need them frequently. |