Skip to content
Browse files

Bump version to start prep for next release

Signed-off-by: Ryan Burrows <rhburrows@gmail.com>
  • Loading branch information...
1 parent 6f3e7e1 commit 375fda7c411f1c7be37cac16877d848c66e2cd27 @rhburrows committed
Showing with 17 additions and 2 deletions.
  1. +3 −0 Manifest.txt
  2. +13 −1 README.md
  3. +1 −1 lib/reviewr/version.rb
View
3 Manifest.txt
@@ -9,8 +9,11 @@ lib/reviewr/git.rb
lib/reviewr/mailer.rb
lib/reviewr/project.rb
lib/reviewr/version.rb
+lib/reviewr/cli/accept.rb
+lib/reviewr/cli/command.rb
lib/reviewr/cli/help.rb
lib/reviewr/cli/main.rb
lib/reviewr/cli/request.rb
+lib/reviewr/templates/accept_email.erb
lib/reviewr/templates/commit_msg.erb
lib/reviewr/templates/request_email.erb
View
14 README.md
@@ -15,7 +15,19 @@ This will result in the following actions:
* Push the code review branch to the remote repository
* Send an email to <email> requesting a code review of the branch
The email will include a link to Github's compare view for the
- changes
+ changes
+
+# Accepting changes from a code review
+ reviewr accept <branch_name>
+This will result in the following actions:
+
+* Create a branch for the reviewed code
+* Rebase the reviewed code on the current branch
+* Merge in the commits
+* Push the merged branch
+* Delete the code review branch from the remote repo
+* Send an email to the requester of the review saying the changes have been
+ merged
## Limitations
View
2 lib/reviewr/version.rb
@@ -1,3 +1,3 @@
module Reviewr
- VERSION = "0.1.3"
+ VERSION = "0.2.0"
end

0 comments on commit 375fda7

Please sign in to comment.
Something went wrong with that request. Please try again.