diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-17 11:23:44 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-17 11:23:44 +0200 |
| commit | 8952c5ce2eeeef1013674feedfceb56e77c874d2 (patch) | |
| tree | 4660fb3e9fd5664a37c52ad44f2949177a5a5a38 /CONTRIBUTING.md | |
| parent | 553680d04e84b91a5c01b0121da76b9c63956c57 (diff) | |
| download | gitlab-ce-8952c5ce2eeeef1013674feedfceb56e77c874d2.tar.gz | |
Highlight the word master when referring to a branch name to make it more obvious, thanks Ben.
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c80c8dbb23..0613fcdf853 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,7 +93,7 @@ For examples of feedback on merge requests please look at already [closed merge 1. The change is as small as possible (see the above paragraph for details) 1. Include proper tests and make all tests pass (unless it contains a test exposing a bug in existing code) 1. Initially contains a single commit (please use `git rebase -i` to squash commits) -1. Can merge without problems (if not please merge master, never rebase commits pushed to the remote server) +1. Can merge without problems (if not please merge `master`, never rebase commits pushed to the remote server) 1. Does not break any existing functionality 1. Fixes one specific issue or implements one specific feature (do not combine things, send separate merge requests if needed) 1. Keeps the GitLab code base clean and well structured |