Skip to content

Commit e7bc03e

Browse files
authored
Merge pull request nodegit#1041 from nodegit/update-libgit2-head
Update to libgit2 37dba1a
2 parents 09008d7 + 0451538 commit e7bc03e

6 files changed

Lines changed: 1391 additions & 670 deletions

File tree

generate/input/descriptor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@
5353
"owner": "Object",
5454
"removeString": "OBJ_"
5555
},
56+
"proxy": {
57+
"JsName": "PROXY",
58+
"isMask": false
59+
},
5660
"ref": {
5761
"owner": "Reference",
5862
"JsName": "TYPE"
@@ -422,6 +426,9 @@
422426
"isErrorCode": true
423427
}
424428
},
429+
"git_commit_create_buffer": {
430+
"ignore": true
431+
},
425432
"git_commit_create_from_callback": {
426433
"ignore": true
427434
},
@@ -1277,6 +1284,9 @@
12771284
}
12781285
}
12791286
},
1287+
"merge_driver": {
1288+
"ignore": true
1289+
},
12801290
"message": {
12811291
"functions": {
12821292
"git_message_prettify": {

0 commit comments

Comments
 (0)