https://github.com/born2snipe/cherrybase

Ruby gem to cherry-pick a range of commits with similar rebase options
https://github.com/born2snipe/cherrybase

Last synced: about 1 year ago
JSON representation

Ruby gem to cherry-pick a range of commits with similar rebase options

• Host: GitHub
• URL: https://github.com/born2snipe/cherrybase
• Owner: born2snipe
• License: mit
• Created: 2009-12-12T19:52:13.000Z (over 16 years ago)
• Default Branch: master
• Last Pushed: 2010-01-13T02:14:05.000Z (over 16 years ago)
• Last Synced: 2025-04-25T00:35:23.029Z (about 1 year ago)
• Language: Ruby
• Homepage:
• Size: 109 KB
• Stars: 2
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.rdoc
  • License: LICENSE

Awesome Lists containing this project

README

          
= cherrybase

Git cherry-pick a range of commits from a another branch into your current branch

== Example usages:

This will attempt to cherry-pick from the  all the way to the very last commit of the .

	cherrybase  

	

This will attempt to cherry-pick from the  all the way to  from the .

	cherrybase  ..

	

This will attempt to cherry-pick from the commit just after the last svn commit from the 

	cherrybase  svn

	

This will attempt to cherry-pick from the commit just after the last svn commit all the way to the  from the 

	cherrybase  svn..

	

If you encounter a merge conflict you should be able to handle this similar to how you would a 'git rebase'. You make the changes as needed and stage the changes for commit. You now have two choices just like with rebasing '--continue' or '--abort'.

This will commit your changes using the authorship of the original commit. Then attempt to proceed with the cherry-picking.

	cherrybase --continue

This will reset your HEAD back to the original commit just before you started cherrybasing.

	cherrybase --abort