diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 06:06:02 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-30 06:06:02 +0000 |
commit | 42572f63eab5db8dc39279e0deeeadef86180a71 (patch) | |
tree | ceab7f3103ae2a6b271ea219eac141adb61ff762 /doc/topics/git | |
parent | e8185569bf058dde3f878b2a6be29649d3bcd49c (diff) | |
download | gitlab-ce-42572f63eab5db8dc39279e0deeeadef86180a71.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics/git')
-rw-r--r-- | doc/topics/git/migrate_to_git_lfs/index.md | 2 | ||||
-rw-r--r-- | doc/topics/git/numerous_undo_possibilities_in_git/index.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/topics/git/migrate_to_git_lfs/index.md b/doc/topics/git/migrate_to_git_lfs/index.md index 6152b5a2e94..9de978dd007 100644 --- a/doc/topics/git/migrate_to_git_lfs/index.md +++ b/doc/topics/git/migrate_to_git_lfs/index.md @@ -15,7 +15,7 @@ will not actually reduce the size of your repository because the files are still referenced by previous commits. Through the method described on this document, first migrate -to Git LFS with [BFG](https://rtyley.github.io/bfg-repo-cleaner/) +to Git LFS with a tool such as the open source community-maintained [BFG](https://rtyley.github.io/bfg-repo-cleaner/) through a mirror repo, then clean up the repository's history, and lastly create LFS tracking rules to prevent new binary files from being added. 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 2ab03df095c..51cafb82cec 100644 --- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md +++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md @@ -487,9 +487,9 @@ git filter-branch --tree-filter 'rm filename' HEAD Since `git filter-branch` command might be slow on big repositories, there are tools that can use some of Git specifics to enable faster execution of common tasks (which is exactly what removing sensitive information file is about). -An alternative is [BFG Repo-cleaner][bfg-repo-cleaner]. Keep in mind that these -tools are faster because they do not provide a same fully feature set as `git filter-branch` -does, but focus on specific use cases. +An alternative is the open source community-maintained tool [BFG][bfg-repo-cleaner]. +Keep in mind that these tools are faster because they do not provide the same +feature set as `git filter-branch` does, but focus on specific use cases. ## Conclusion |