diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-07 03:08:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-07 03:08:33 +0300 |
| commit | c9a3dc1c2464a92a8f2a5c2f4f30883aa9f976f1 (patch) | |
| tree | a56df6907c26f0aa59f2c6e211e0cc7aea61e026 /doc/user/project/git_attributes.md | |
| parent | aa74b7b4c5f326e82fcd6bb681296dce435ea024 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/git_attributes.md')
| -rw-r--r-- | doc/user/project/git_attributes.md | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/user/project/git_attributes.md b/doc/user/project/git_attributes.md index 2a3e98037ce..2a5221e9c84 100644 --- a/doc/user/project/git_attributes.md +++ b/doc/user/project/git_attributes.md @@ -52,13 +52,12 @@ The `.gitattributes` file can be used to define which language to use when syntax highlighting files and diffs. For more information, see [Syntax highlighting](highlighting.md). -## Custom merge drivers +## Custom merge drivers **(FREE SELF)** > Ability to configure custom merge drivers through GitLab introduced in GitLab 15.10. -You can define [custom merge drivers](https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver) -in a GitLab configuration file, then use the custom merge drivers in a Git -`.gitattributes` file. +GitLab self-managed instance administrators can define [custom merge drivers](https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver) +in a GitLab configuration file, then use the custom merge drivers in a Git `.gitattributes` file. Custom merge drivers are not supported on GitLab.com. You might configure a custom merge driver, for example, if there are certain files that should be ignored during a merge such as build files and configuration files. |