Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TODO] fix #130 #138

Merged
merged 17 commits into from
Dec 29, 2018
Merged

[TODO] fix #130 #138

merged 17 commits into from
Dec 29, 2018

Conversation

timotheecour
Copy link
Member

@timotheecour timotheecour commented Dec 16, 2018

/cc @Varriount

the 2 branches have diverged but this fixes it:

git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative origin/restructure-for-st3...origin/master

* 7f37800 - (origin/restructure-for-st3, restructure-for-st3) fix #134 (#135) (5 days ago)
* 2338490 - comment and doc comment completion work (#133) (9 days ago)
* fccda07 - Remove ST2/ST3 distinction. (5 weeks ago)
* 15c2679 - Fix comment continuation. (5 weeks ago)
* da49d31 - Simplify package settings menu by using native edit_settings command. (5 weeks ago)
* 83ef1a4 - Straighten out TODO matching. (6 weeks ago)
* 25177bb - Update keymaps for new comment definitions. Fixes #94, #97, and #128 (6 weeks ago)
* b281d19 - Split comment grammer into separate file, to support nested multiline comments. Fixes #94 (6 weeks ago)
* 864d19c - fix #112 (#123) (6 weeks ago)
* 11217c6 - Make command import more correct. (6 weeks ago)
* af673a8 - fix #118 (#120) (6 weeks ago)
* 80b53a2 - Fix file permissions. (6 weeks ago)
* 23824ac - Fix #110 (6 weeks ago)
* 54337b8 - Refactor settings, hotkeys, and nimcheck code. (6 weeks ago)
* 73588d0 - Move core files to 'core' directory. Remove Nimsuggest and Nimble support. (6 weeks ago)
* e63f5bf - (origin/master, origin/HEAD, master) Update Nim.YAML-tmLanguage (#126) (6 weeks ago)
* cc5bd88 - fix #125 (#127) (6 weeks ago)

note

alternatively, if the diff scares you, you can do it yourself via:

git checkout master
git pull --rebase origin/master
git rebase origin/restructure-for-st3
git push

@timotheecour
Copy link
Member Author

@Varriount ping

@timotheecour
Copy link
Member Author

/cc @Varriount ping

@Varriount Varriount merged commit f75325a into nim-lang:master Dec 29, 2018
@timotheecour
Copy link
Member Author

/cc @Varriount do you mind closing restructure-for-st3 branch now that this was merged, to avoid further confusion (as noted in #138 (comment)); thanks!

@timotheecour timotheecour deleted the pr_fix_130 branch December 29, 2018 20:35
@timotheecour timotheecour changed the title fix #130 [TODO] fix #130 Dec 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

restructure-for-st3 should be merged back to master
3 participants