Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
ffbs-gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ffbs
ffbs-gluon
Commits
92118cf1
Commit
92118cf1
authored
8 years ago
by
Jan-Philipp Litza
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove squashing from contribution guidelines (#865)
parent
a3dcece3
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CONTRIBUTING.md
+0
-16
0 additions, 16 deletions
CONTRIBUTING.md
with
0 additions
and
16 deletions
CONTRIBUTING.md
+
0
−
16
View file @
92118cf1
...
...
@@ -46,24 +46,8 @@ fix some bug, detail in the remaining commit message exactly how it could be
triggered and what you did to fix it. If in question, have a glance at the
existing commit messages to get the idea.
Squash commits
--------------
Most changes are trivial enough to fit in one single commit in order to not
clutter the history. While developing a new feature, you are free to use
multiple commits, but if your feature is to be merged, reduce the number of
commits to a minimum. Even huge feature introductions like the 802.11s mesh
(commit [2a93c58]) fit into a single commit.
If you developed your change in multiple smaller commits, you can easily
[squash] those before opening the pull request. While discussing, it is okay to
do your changes using
`git commit --amend`
and force-push them to your head of
the pull request. This way, your change always consists of only one commit and
can be merged in the instant everybody is content with the whole thing.
[
packages
]:
http://gluon.readthedocs.org/en/latest/user/site.html#packages
[
#gluon
]:
https://webirc.hackint.org/#gluon
[
mailing list
]:
mailto:gluon@luebeck.freifunk.net
[
list of rejected features
]:
https://github.com/freifunk-gluon/gluon/issues?q=label%3Arejected
[
2a93c58
]:
https://github.com/freifunk-gluon/gluon/commit/2a93c580428d10724116b0d2d1238e2745715a14
[
squash
]:
https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment