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

Exceptions

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b exceptions origin/exceptions

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 exceptions

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

    Added 1 commit:

    • 266aaed0 - Added int tests to kern.c
    Oct 19, 2015

    Added 1 commit:

    • 266aaed0 - Added int tests to kern.c
    Added 1 commit: * 266aaed0 - Added int tests to kern.c
    Toggle commit list
  • malcolm @malcolm

    Added 1 commit:

    • 3214743a - Add support for c-level interrupt handlers
    Oct 19, 2015

    Added 1 commit:

    • 3214743a - Add support for c-level interrupt handlers
    Added 1 commit: * 3214743a - Add support for c-level interrupt handlers
    Toggle commit list
  • malcolm @malcolm

    Added 1 commit:

    • 9360a1b9 - Changed c interrupt header
    Oct 19, 2015

    Added 1 commit:

    • 9360a1b9 - Changed c interrupt header
    Added 1 commit: * 9360a1b9 - Changed c interrupt header
    Toggle commit list
  • malcolm @malcolm

    Added 1 commit:

    • 2af81b59 - Added individual exception function headers
    Oct 19, 2015

    Added 1 commit:

    • 2af81b59 - Added individual exception function headers
    Added 1 commit: * 2af81b59 - Added individual exception function headers
    Toggle commit list
  • malcolm @malcolm

    Added 1 commit:

    • eb0ac162 - Added exceptions.c skeleton
    Oct 20, 2015

    Added 1 commit:

    • eb0ac162 - Added exceptions.c skeleton
    Added 1 commit: * eb0ac162 - Added exceptions.c skeleton
    Toggle commit list
  • malcolm @malcolm

    Added 2 commits:

    • 6f590d1c - added debug output to individual exceptions
    • 00b25e59 - Fixed typo
    Oct 21, 2015

    Added 2 commits:

    • 6f590d1c - added debug output to individual exceptions
    • 00b25e59 - Fixed typo
    Added 2 commits: * 6f590d1c - added debug output to individual exceptions * 00b25e59 - Fixed typo
    Toggle commit list
  • malcolm @malcolm

    Added 1 commit:

    • 80e176fc - Added load_errors to assign error functions to handlers
    Oct 21, 2015

    Added 1 commit:

    • 80e176fc - Added load_errors to assign error functions to handlers
    Added 1 commit: * 80e176fc - Added load_errors to assign error functions to handlers
    Toggle commit list
  • malcolm @malcolm commented Oct 21, 2015
    Master

    Ready to merge after review

    Ready to merge after review
  • malcolm @malcolm

    Title changed from [WIP] Exceptions to Exceptions

    Oct 21, 2015

    Title changed from [WIP] Exceptions to Exceptions

    Title changed from **[WIP] Exceptions** to **Exceptions**
    Toggle commit list
  • triazo @triazo

    Status changed to merged

    Oct 21, 2015

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • triazo @triazo

    mentioned in commit 155b2238

    Oct 21, 2015

    mentioned in commit 155b2238

    mentioned in commit 155b2238e48ecd1d5f01d0f9c7fc81d4505d3e77
    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!12