FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Added NodeGit.Checkout.index by jdgarcia · Pull Request #579 · nodegit/nodegit · GitHub

Repository navigation

Added NodeGit.Checkout.index - #579

Merged
johnhaley81 merged 4 commits into
nodegit:masterfrom
jdgarcia:merge-conflicts
May 20, 2015
Merged

johnhaley81 merged 4 commits into
nodegit:masterfrom
jdgarcia:merge-conflicts

Conversation

Copy link
Copy Markdown
Collaborator
  • updated descriptor.json for git_checkout_index (was previously ignored)
  • added normalize option convenience method
  • added a test to make sure an index with conflicts will write to disk when checked out

This function is useful for easily writing merge conflicts to disk since both merge and rebase will throw the index when there are merge conflicts

jdgarcia changed the title Added NodeGit.Checkout.index [WIP] Added NodeGit.Checkout.index May 19, 2015
jdgarcia changed the title [WIP] Added NodeGit.Checkout.index Added NodeGit.Checkout.index May 19, 2015

Copy link
Copy Markdown
Collaborator

Thanks man. This looks great!

johnhaley81 added a commit that referenced this pull request May 20, 2015
johnhaley81 merged commit 15d67b3 into nodegit:master May 20, 2015
jdgarcia deleted the merge-conflicts branch April 21, 2016 17:12
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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.

2 participants


Back | FazBrowse Home | New Git URL