Skip to content

Fix Rebase issues #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tbranyen merged 14 commits into from
May 15, 2015
Merged

Fix Rebase issues #568

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
10e0ffc
fix annotated_commit in libgit2-supplement.json
jdgarcia May 8, 2015
d0ce712
add git_rebase_next to libgit2-supplement.json
jdgarcia May 8, 2015
7de5087
test: clean rebase ff
jdgarcia May 8, 2015
5f88721
update descriptor.json for git_rebase_init and git_rebase_commit
jdgarcia May 12, 2015
9ee1085
test: cleanly rebase one branch onto another branch
jdgarcia May 12, 2015
051b3c4
test convenience methods for adding/removing files from the index
jdgarcia May 12, 2015
a4c1230
test: rebase with merge conflicts
jdgarcia May 13, 2015
889025d
ignore git_rebase_free
jdgarcia May 13, 2015
4ed584d
test: abort rebase
jdgarcia May 13, 2015
3808db2
in normalizeOptions, check if options exists before bothering to crea…
jdgarcia May 13, 2015
e20f887
in normalizeOptions(), immediately return options if it's an instance…
jdgarcia May 14, 2015
da808cb
git_rebase_finish signature is optional
jdgarcia May 14, 2015
ab50c82
convenience methods for normalizing opts
jdgarcia May 14, 2015
2ab75df
added convenience method: repository.rebaseBranches()
jdgarcia May 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update descriptor.json for git_rebase_init and git_rebase_commit
  • Loading branch information
@jdgarcia
jdgarcia committed May 14, 2015
commit 5f88721d564d9e976904f5c7d5ff06ecaf8c0fa2
37 changes: 37 additions & 0 deletions generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,6 +1278,43 @@
}
}
},
"rebase": {
"functions": {
"git_rebase_commit": {
"args": {
"id": {
"isReturn": true,
"shouldAlloc": true
},
"author": {
"isOptional": true
},
"message_encoding": {
"isOptional": true
},
"message": {
"isOptional": true
}
}
},
"git_rebase_init": {
"args": {
"upstream": {
"isOptional": true
},
"onto": {
"isOptional": true
},
"signature": {
"isOptional": true
},
"opts": {
"isOptional": true
}
}
}
}
},
"refdb": {
"functions": {
"git_refdb_backend_fs": {
Expand Down