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 !11 opened Oct 13, 2015 by malcolm@malcolm 

Style applied to existing files

Style applied to files. Needs to be checked over for consistency in spacing, newlines, etc.

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b stylecatchup origin/stylecatchup

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 stylecatchup

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 1
  • Commits 2
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • malcolm @malcolm

    Added 1 commit:

    • 7b01b9a2 - Update idt.c
    Oct 13, 2015

    Added 1 commit:

    • 7b01b9a2 - Update idt.c
    Added 1 commit: * 7b01b9a2 - Update idt.c
    Toggle commit list
  • malcolm @malcolm

    Title changed from [WIP] Style applied to existing files to Style applied to existing files

    Oct 13, 2015

    Title changed from [WIP] Style applied to existing files to Style applied to existing files

    Title changed from **[WIP] Style applied to existing files** to **Style applied to existing files**
    Toggle commit list
  • malcolm @malcolm commented Oct 13, 2015
    Master

    Fixed up, should be good to go.

    Fixed up, should be good to go.
  • triazo @triazo

    mentioned in commit e8ba1cb0

    Oct 15, 2015

    mentioned in commit e8ba1cb0

    mentioned in commit e8ba1cb044d91dd5359649465dd68431d4cb9aa0
    Toggle commit list
  • triazo @triazo

    Status changed to merged

    Oct 15, 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!11