Skip to content
This repository has been archived by the owner on Mar 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #910 from alawatthe/patch-1
Browse files Browse the repository at this point in the history 
Fixes #909 (wrong type for disallow-capitalized-comments)
  • Loading branch information
@mrjoelkemp
mrjoelkemp committed Jan 13, 2015
2 parents 21b40fa + b6d73e0 commit 8bd2ffd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/rules/disallow-capitalized-comments.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Requires the first alphabetical character of a comment to be lowercase.
*
* Type: `String`
* Type: `Boolean`
*
* Value: `true`
*
Expand Down

8 comments on commit 8bd2ffd

@markelog
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't use "merge" button, commit msg also should be in line with our guidlines

@mrjoelkemp
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have seen simple patches go in without message fixes. A one word fix becomes a chore to pull, rebase, merge, then do local cleanup. I like trivial patches being less tedious (and easier to get in), but will conform to fixing up every commit.

@AlexanderZeilmann
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah right, I'll remember the message format for next time. What do you mean with "We don't use "merge" button"?

@mrjoelkemp
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alawatthe No worries, it's my fault :) We pull down pull requests, rebase them off of master – editing the commit message if it doesn't conform to the guidelines, and then locally (fast forward) merge, then push upstream. The result is no merge commits and a clean and tidy commit history. We don't hit the merge button on github for those reasons.

@AlexanderZeilmann
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. So it is no problem to use the editor build right into Github for small fixes like this, right?

@mrjoelkemp
Copy link
Member Author

@mrjoelkemp mrjoelkemp commented on 8bd2ffd Jan 13, 2015 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@markelog
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We pull down pull requests, rebase them off of master – editing the commit message if it doesn't conform to the guidelines, and then locally (fast forward) merge, then push upstream

Wow, sounds like a ton of work to do :-).

@mdevils
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, sounds like a ton of work to do :-).

Unfortunately it does require a ton of work :-(

Please sign in to comment.