-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Smile plugin. #497
Smile plugin. #497
Conversation
This is not properly rebased on master. git remote add upstream https://github.com/matryer/bitbar-plugins.git
git fetch upstream
git checkout smile-plugin
git rebase upstream/master
# Fix merge errors
git push --force origin smile-plugin #assuming your repo is origin Next time you start a new plugin do the following: git fetch upstream
git checkout upstream/master -b new-plugin That should keep your history clear of anything except your new plugin. |
Thanks for the tips on the clean history. That annoyed me too. Will try to to keep the commits spick and span next time. |
Hmm.. Not sure why all that history is coming with you... Try this: git checkout smile-plugin -b new-smile # Checkout a new branch based on the old branch so we retain the commit
git checkout upstream/master -B smile-plugin # Checkout upstream/master over top of old branch
git cherry-pick 75b4667 # Cherry-pick the commit into our new smile-plugin branch
git log # Make sure you are good here and everything is as expected!
git push origin smile-plugin --force # Push it to github
git branch -D new-smile # Delete the temp holding branch we don't need As for the "errors" reported by |
I love this plugin - @irstacks can you please get those final errors solved so we can get this added to the repo? |
Awesome, thanks @matryer. @tresni I wound up doing the following $ git checkout master
$ git reset --hard upstream/master
$ git branch -b new-smile
$ git cherry-pick f9417b5 # (different commit cuz my earlier tanglings)
$ git push origin new-smile:smile-plugin --force Knocking the shellcheckers off now. |
There are quite a few emojis that don't properly emoji-ize. I left em because
I don't know where to begin addressing the issue w/r/t to BitBar's emojification-izer, but would be happy to pitch in if I can. Specifically:
My list came directly from http://www.webpagefx.com/tools/emoji-cheat-sheet/ |
@irstacks See matryer/xbar#312 |
Noted, @iosdeveloper, thanks. |
Some of those aren't Unicode emoji. That includes most of the ones you pointed out. Unless you felt like attempting to supply an image for those where appropriate, I don't think it's worth worrying about ;-) Merging this in! |
* Add smile plugin cleanly, I hpoe. * Fix shellcheck codes. * Ignore brace expansions shellcheck complaints. * Don't copy echo's newline. * Notify what has been copied to clipboard.
😄