Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Fix Rebase issues#568

Merged
tbranyen merged 14 commits intonodegit:masternodegit/nodegit:masterfrom
jdgarcia:fix-rebaseCopy head branch name to clipboard
May 15, 2015
Merged

Fix Rebase issues#568
tbranyen merged 14 commits intonodegit:masternodegit/nodegit:masterfrom
jdgarcia:fix-rebaseCopy head branch name to clipboard

Conversation

@jdgarcia
Copy link
Collaborator

  • annotated_commit was mistakenly named annotated in libgit2-supplement.json, and was thus not appearing in the NodeGit due to annotated being one of the removed groups. fixed the name.
  • added the git_rebase_next function to libgit2-supplment.json
  • updated descriptor.json for git_rebase_commit, git_rebase_finish, git_rebase_free, and git_rebase_init
  • fixed an issue with normalize_options.js causing errors if an instance of the Ctor was passed in
  • added Rebase convenience methods for normalizing options
  • added rebaseBranches and continueRebase convenience methods to Repository to help automate the rebase steps
  • added /tests/rebase.js for testing rebasing with and without the convenience methods

@tbranyen
Copy link
Member

Holy crap this is beautiful. Thank you!

@johnhaley81
Copy link
Collaborator

Agreed! This rocks! Nice job @jdgarcia!

tbranyen added a commit that referenced this pull request May 15, 2015
@tbranyen tbranyen merged commit 84901cd into nodegit:master May 15, 2015
@maxkorp
Copy link
Collaborator

maxkorp commented May 15, 2015

Yessssssss

@jdgarcia jdgarcia deleted the fix-rebase branch April 21, 2016 17:12
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.

4 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.