Struct git2::MergeOptions [−][src]
Options to specify when merging.
Implementations
impl MergeOptions
[src]
pub fn new() -> MergeOptions
[src]
Creates a default set of merge options.
pub fn find_renames(&mut self, find: bool) -> &mut MergeOptions
[src]
Detect file renames
pub fn fail_on_conflict(&mut self, fail: bool) -> &mut MergeOptions
[src]
If a conflict occurs, exit immediately instead of attempting to continue resolving conflicts
pub fn skip_reuc(&mut self, skip: bool) -> &mut MergeOptions
[src]
Do not write the REUC extension on the generated index
pub fn no_recursive(&mut self, disable: bool) -> &mut MergeOptions
[src]
If the commits being merged have multiple merge bases, do not build a recursive merge base (by merging the multiple merge bases), instead simply use the first base.
pub fn rename_threshold(&mut self, thresh: u32) -> &mut MergeOptions
[src]
Similarity to consider a file renamed (default 50)
pub fn target_limit(&mut self, limit: u32) -> &mut MergeOptions
[src]
Maximum similarity sources to examine for renames (default 200).
If the number of rename candidates (add / delete pairs) is greater
than this value, inexact rename detection is aborted. This setting
overrides the merge.renameLimit
configuration value.
pub fn recursion_limit(&mut self, limit: u32) -> &mut MergeOptions
[src]
Maximum number of times to merge common ancestors to build a virtual merge base when faced with criss-cross merges. When this limit is reached, the next ancestor will simply be used instead of attempting to merge it. The default is unlimited.
pub fn file_favor(&mut self, favor: FileFavor) -> &mut MergeOptions
[src]
Specify a side to favor for resolving conflicts
pub fn standard_style(&mut self, standard: bool) -> &mut MergeOptions
[src]
Create standard conflicted merge files
pub fn diff3_style(&mut self, diff3: bool) -> &mut MergeOptions
[src]
Create diff3-style file
pub fn simplify_alnum(&mut self, simplify: bool) -> &mut MergeOptions
[src]
Condense non-alphanumeric regions for simplified diff file
pub fn ignore_whitespace(&mut self, ignore: bool) -> &mut MergeOptions
[src]
Ignore all whitespace
pub fn ignore_whitespace_change(&mut self, ignore: bool) -> &mut MergeOptions
[src]
Ignore changes in amount of whitespace
pub fn ignore_whitespace_eol(&mut self, ignore: bool) -> &mut MergeOptions
[src]
Ignore whitespace at end of line
pub fn patience(&mut self, patience: bool) -> &mut MergeOptions
[src]
Use the “patience diff” algorithm
pub fn minimal(&mut self, minimal: bool) -> &mut MergeOptions
[src]
Take extra time to find minimal diff
pub unsafe fn raw(&self) -> *const git_merge_options
[src]
Acquire a pointer to the underlying raw options.
Trait Implementations
impl Default for MergeOptions
[src]
Auto Trait Implementations
impl RefUnwindSafe for MergeOptions
impl !Send for MergeOptions
impl !Sync for MergeOptions
impl Unpin for MergeOptions
impl UnwindSafe for MergeOptions
Blanket Implementations
impl<T> Any for T where
T: 'static + ?Sized,
[src]
T: 'static + ?Sized,
impl<T> Borrow<T> for T where
T: ?Sized,
[src]
T: ?Sized,
impl<T> BorrowMut<T> for T where
T: ?Sized,
[src]
T: ?Sized,
pub fn borrow_mut(&mut self) -> &mut T
[src]
impl<T> From<T> for T
[src]
impl<T, U> Into<U> for T where
U: From<T>,
[src]
U: From<T>,
impl<T, U> TryFrom<U> for T where
U: Into<T>,
[src]
U: Into<T>,
type Error = Infallible
The type returned in the event of a conversion error.
pub fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>
[src]
impl<T, U> TryInto<U> for T where
U: TryFrom<T>,
[src]
U: TryFrom<T>,