diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 06:09:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 06:09:14 +0300 |
| commit | 78fe72d153260c355fdfd533b125026cce310da7 (patch) | |
| tree | 0d90106443bea87cc24e2834273ae6c8dcac0260 /doc/topics | |
| parent | 88797b994a7dfd9bfab2a5d5431f088f17078b9f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/git/numerous_undo_possibilities_in_git/index.md | 6 |
1 files changed, 3 insertions, 3 deletions
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 cea052f3a90..3b93c978931 100644 --- a/doc/topics/git/numerous_undo_possibilities_in_git/index.md +++ b/doc/topics/git/numerous_undo_possibilities_in_git/index.md @@ -253,7 +253,7 @@ In our example we will end up with commit `B`, that introduced bug/error. We hav - Undo changes on a single file or directory from commit `B`, but retain them in the unstaged state: ```shell - git reset commit-B-id <file> + git reset commit-B-id <file> ``` - There is one command we also must not forget: **creating a new branch** @@ -487,8 +487,8 @@ 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 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 +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 |