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

Custom labels #137

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Custom labels #137

wants to merge 19 commits into from

Conversation

bokysan
Copy link

@bokysan bokysan commented Oct 14, 2013

Hi,

please find attached a few changes (with examples in index.html) for better custom label handling. The changes basically allow you to:

  • have an event callback to display custom text in the select box
  • have an event callback for rendering the label options
  • attach custom classes to the dropdowns
  • resize the dropdown independently from the select box.

Cheers,
B

@marcj
Copy link
Owner

marcj commented Oct 15, 2013

Cool! Can you fix the username of the commiter? There is 'boky' but your github account name is 'boky8'.

@bokysan
Copy link
Author

bokysan commented Oct 15, 2013

I'd love to,

but I'm kind of new to git and don't really know how. I did "git config
username" and "git commit --amend" and "git push", but I don't think it's
there. F1, please?

On Tue, Oct 15, 2013 at 5:53 PM, Marc J. Schmidt
notifications@github.comwrote:

Cool! Can you fix the username of the commiter? There is 'boky' but your
github account name is 'boky8'.


Reply to this email directly or view it on GitHubhttps://github.com//pull/137#issuecomment-26346912
.

Gishpuppy | [Edit Delivery Settingshttp://www.gishpuppy.com/cgi-bin/edit.py?email=github.y50@gishpuppy.com
]

@marcj
Copy link
Owner

marcj commented Oct 15, 2013

Boky, you need to setup in your environment the same email as you have used in github.
More information here:

https://help.github.com/articles/setting-your-email-in-git

git config --global user.email "me@here.com"
Commits on GitHub don't link to my account

Make sure you've added the same email to your GitHub account settings. It may take some time for old commits to fall out of the server's cache, but new commits should link up immediately after pushing if the emails match.

I guess after that a git commit --amend fixes the issue then. After you have changed your history (--amend) you have to force the git push via git push +master, otherwise you get all those merge commits which we don't want.

Can you please squad all commits to one commit (especially to remove those 'merge' commits).

@bokysan
Copy link
Author

bokysan commented Oct 16, 2013

Is this it?

@marcj
Copy link
Owner

marcj commented Oct 16, 2013

Unfortunately not. Now we have 8 commits in this PR. :P

@marcj
Copy link
Owner

marcj commented Oct 16, 2013

But the name is now correct.

@bokysan
Copy link
Author

bokysan commented Oct 16, 2013

Great.

Now I just need to figure out how to squash these commits.

I did git rebase -i, git commit amend, git push, but I guess that's not it.

B
On Oct 16, 2013 9:32 PM, "Marc J. Schmidt" notifications@github.com wrote:

But the name is now correct.


Reply to this email directly or view it on GitHubhttps://github.com//pull/137#issuecomment-26449960
.

Gishpuppy | [Edit Delivery Settingshttp://www.gishpuppy.com/cgi-bin/edit.py?email=github.y50@gishpuppy.com
]

@ShawnCG
Copy link
Contributor

ShawnCG commented Oct 16, 2013

Marc sent me to this site when I was having an issue.

http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

Hope it helps!

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.

None yet

5 participants