Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Haelwenn
glitchsoc-fe
Commits
0506f1a5
Commit
0506f1a5
authored
Oct 22, 2018
by
Haelwenn
Browse files
Merge branch 'patch-1' into 'mastofe/glitch-soc'
Address a typo in README.md See merge request
!1
parents
e822ca10
ec80b672
Pipeline
#4049
passed with stage
in 9 minutes and 45 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
README.md
View file @
0506f1a5
...
...
@@ -63,5 +63,5 @@ server {
## Why rebase instead of merge
-
We should just have a set of patches on top of glitch-soc to make it work (maybe a bit of branding) and tend to upstream other changes
-
Merging can lead to lo
o
sing some of our patches (happened to mastofe, the previous repo)
-
Merging can lead to losing some of our patches (happened to mastofe, the previous repo)
-
It allows us to see more easily what are our changes compared to upstream
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment