summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-04-13 08:42:10 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-04-13 08:42:10 +0000
commit791bc18a5faed3043936f0bd4885a9dbe121ffba (patch)
treefe76e7edf334ac0fee153b2468ad32179526bd28
parentac149be040009eff8847a1078031d92c5afc27d8 (diff)
parent92f1f67877e7eee375f911f27df9517ec55d6cca (diff)
downloadgitlab-ce-791bc18a5faed3043936f0bd4885a9dbe121ffba.tar.gz
Merge branch 'contribute/no-rm-rf-gitlab-basics' into 'master'
Don't use "-f" with "rm" in Gitlab-Basics Docs Closes #20071 See merge request gitlab-org/gitlab-ce!18027
-rw-r--r--changelogs/no-rm-rf-gitlab-basics.yml5
-rw-r--r--doc/gitlab-basics/command-line-commands.md2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/no-rm-rf-gitlab-basics.yml b/changelogs/no-rm-rf-gitlab-basics.yml
new file mode 100644
index 00000000000..d5aa1091b45
--- /dev/null
+++ b/changelogs/no-rm-rf-gitlab-basics.yml
@@ -0,0 +1,5 @@
+---
+ title: Do not use '-f' with 'rm' in gitlab-basics docs
+ merge_request: 18027
+ author: Elias Werberich
+ type: changed
diff --git a/doc/gitlab-basics/command-line-commands.md b/doc/gitlab-basics/command-line-commands.md
index 2a531193adf..c9766040234 100644
--- a/doc/gitlab-basics/command-line-commands.md
+++ b/doc/gitlab-basics/command-line-commands.md
@@ -71,7 +71,7 @@ rm NAME-OF-FILE
### Remove a directory and all of its contents
```
-rm -rf NAME-OF-DIRECTORY
+rm -r NAME-OF-DIRECTORY
```
### View history in the command line