Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

triazo / kernel

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 3
  • Merge Requests 0
  • Wiki
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge request !10 opened Oct 11, 2015 by triazo@triazo 

Style

subject to change as we notice things that the config does not actually specify and want coded.

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b style origin/style

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff style

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 3
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • triazo @triazo

    Added 6 commits:

    • 04243bf4...9b7f69cf - 3 commits from branch master
    • 9aef7ce8 - Add basic style guide
    • 99a0c7ba - Put MIT license on project
    • de6bc46d - Add uncrustify config for whitespace stuff
    Oct 11, 2015

    Added 6 commits:

    • 04243bf4...9b7f69cf - 3 commits from branch master
    • 9aef7ce8 - Add basic style guide
    • 99a0c7ba - Put MIT license on project
    • de6bc46d - Add uncrustify config for whitespace stuff
    Added 6 commits: * 04243bf4...9b7f69cf - 3 commits from branch `master` * 9aef7ce8 - Add basic style guide * 99a0c7ba - Put MIT license on project * de6bc46d - Add uncrustify config for whitespace stuff
    Toggle commit list
  • malcolm @malcolm

    mentioned in commit cac64f4b

    Oct 11, 2015

    mentioned in commit cac64f4b

    mentioned in commit cac64f4b4e4339bd2315974e72a088e5dd219456
    Toggle commit list
  • malcolm @malcolm

    Status changed to merged

    Oct 11, 2015

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: triazo/kernel!10