Skip to content

Commit

Permalink
Add doc for newbase option
Browse files Browse the repository at this point in the history
  • Loading branch information
kshyatt committed Jan 18, 2017
1 parent e99061e commit e63640c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions base/libgit2/libgit2.jl
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ end
Attempt an automatic merge rebase of the current branch, from `upstream` if provided, or
otherwise from the upstream tracking branch.
`newbase` is the branch to rebase onto. By default this is `upstream`.
If any conflicts arise which cannot be automatically resolved, the rebase will abort,
leaving the repository and working tree in its original state, and the function will throw
Expand Down

0 comments on commit e63640c

Please sign in to comment.