diff options
| author | Edward Thomson <ethomson@github.com> | 2016-02-11 10:11:21 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-02-11 10:49:25 -0800 |
| commit | a202e0d45bcfd672cf1ff75abc192e6a592874ba (patch) | |
| tree | 62da08fff9ad113906dd89ebf528d2eb8cc30d8e /include/git2/commit.h | |
| parent | ee6673070a6134f0a1743c866583b14a305b6a43 (diff) | |
| download | libgit2-a202e0d45bcfd672cf1ff75abc192e6a592874ba.tar.gz | |
rebase: allow custom merge_options
Allow callers of rebase to specify custom merge options. This may
allow custom conflict resolution, or failing fast when conflicts
are detected.
Diffstat (limited to 'include/git2/commit.h')
0 files changed, 0 insertions, 0 deletions