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 !3 opened Sep 05, 2015 by malcolm@malcolm 

Added multi-stage bootloader that loads real bootloader from disk

Multi-stage bootloader that should load the main code into memory

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b multi-stage origin/multi-stage

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 multi-stage

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 1
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • triazo @triazo commented Sep 05, 2015
    Master

    Looks good enough. Codebase is still too small to be super formal about this.

    Looks good enough. Codebase is still too small to be super formal about this.
  • triazo @triazo

    mentioned in commit 10f6f815

    Sep 05, 2015

    mentioned in commit 10f6f815

    mentioned in commit 10f6f815712468b1cabac3976aa9924a219019c9
    Toggle commit list
  • triazo @triazo

    Status changed to merged

    Sep 05, 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
triazo
Assignee
triazo @triazo
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: triazo/kernel!3